diff --git a/pom.xml b/pom.xml index a296292295acb4bdc725661c07b64a220dd55f21..dee4a4f6815b60e1e44e3bcbee90ce970b37a547 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ <java.version>11</java.version> <maven.version>3.8.1</maven.version> <!-- version properties --> - <deegree3.version>3.5.3.1</deegree3.version> + <deegree3.version>3.5.6-SNAPSHOT</deegree3.version> <xplanung.regeln.version>1.1.6</xplanung.regeln.version> <xplanung.regeln.berlin.version>0.4</xplanung.regeln.berlin.version> <gwt.version>2.10.0</gwt.version> @@ -38,6 +38,13 @@ <liquibase.version>4.25.0</liquibase.version> <postgresql.version>42.5.4</postgresql.version> <owasp.version>8.4.3</owasp.version> + <!-- API properties --> + <base.package.name>de.latlon.xplanbox</base.package.name> + <javax.servlet-api.version>4.0.1</javax.servlet-api.version> + <jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version> + <jersey.version>2.35</jersey.version> + <swagger.version>2.1.13</swagger.version> + <swagger-ui.version>3.17.0</swagger-ui.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> @@ -54,17 +61,15 @@ </properties> <modules> - <module>xplan-api</module> <module>xplan-cli</module> - <module>xplan-configuration</module> <module>xplan-core</module> + <module>xplan-database</module> <module>xplan-documentation</module> - <module>xplan-resources</module> - <module>xplan-security</module> + <module>xplan-dokumente</module> + <module>xplan-manager</module> <module>xplan-tests</module> - <module>xplan-webapps</module> + <module>xplan-validator</module> <module>xplan-webservices</module> - <module>xplan-workspaces</module> </modules> <profiles> @@ -179,7 +184,7 @@ <exclude>*/xplan-tests-soapui/src/main/resource/xplan-api-manager/**</exclude> <exclude>*/xplan-tests-soapui/src/main/resource/xplan-api-validator/**</exclude> <exclude>*/xplan-tests-soapui/src/main/resource/xplan-webservices/**</exclude> - <exclude>*/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/**</exclude> + <exclude>*/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/**</exclude> <exclude>**/*.json</exclude> <exclude>**./.properties</exclude> </excludes> @@ -1081,43 +1086,39 @@ <!-- xplan-manager internal dependencies with version --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-api-commons</artifactId> + <artifactId>xplan-core-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-tests-resources</artifactId> + <artifactId>xplan-core-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> <classifier>sources</classifier> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons-cli</artifactId> + <artifactId>xplan-cli-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons-web</artifactId> + <artifactId>xplan-core-validator</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-validator-core</artifactId> + <artifactId>xplan-core-gwt</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-validator-web-commons</artifactId> + <artifactId>xplan-core-gwt</artifactId> + <classifier>sources</classifier> <version>${project.version}</version> </dependency> <dependency> @@ -1127,27 +1128,27 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-manager-core</artifactId> + <artifactId>xplan-core-manager</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-schemas</artifactId> + <artifactId>xplan-core-schemas</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons-webservices</artifactId> + <artifactId>xplan-webservices-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-inspireplu-transformation</artifactId> + <artifactId>xplan-core-inspireplu</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-synthesizer</artifactId> + <artifactId>xplan-core-synthesizer</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -1157,7 +1158,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-schemas</artifactId> + <artifactId>xplan-core-schemas</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> @@ -1168,7 +1169,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <classifier>xplan-manager-workspace</classifier> <version>${project.version}</version> <type>zip</type> diff --git a/xplan-api/pom.xml b/xplan-api/pom.xml deleted file mode 100644 index e0736002487ca830d178a3974ed715bb66bcb050..0000000000000000000000000000000000000000 --- a/xplan-api/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?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-api</artifactId> - <packaging>pom</packaging> - <description>Modul zur Gruppierung der REST-API</description> - - <parent> - <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplanbox</artifactId> - <version>7.2-SNAPSHOT</version> - </parent> - - <modules> - <module>xplan-api-commons</module> - <module>xplan-api-validator</module> - <module>xplan-api-manager</module> - <module>xplan-api-dokumente</module> - </modules> - - <properties> - <base.package.name>de.latlon.xplanbox</base.package.name> - <javax.servlet-api.version>4.0.1</javax.servlet-api.version> - <jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version> - <jersey.version>2.35</jersey.version> - <swagger.version>2.1.13</swagger.version> - <swagger-ui.version>3.17.0</swagger-ui.version> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <failOnMissingWebXml>false</failOnMissingWebXml> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - <webResources> - <resource> - <directory>src/main/webapp</directory> - <includes> - <include>**/version.txt</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/webapp</directory> - <excludes> - <exclude>**/version.txt</exclude> - </excludes> - <filtering>false</filtering> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/xplan-cli/pom.xml b/xplan-cli/pom.xml index 92fc473604a38c14d3beec5317408bd460926ab8..607f7da149540d95522e272e9dfc718abc0c64ae 100644 --- a/xplan-cli/pom.xml +++ b/xplan-cli/pom.xml @@ -12,6 +12,7 @@ </parent> <modules> + <module>xplan-cli-core</module> <module>xplan-manager-cli</module> <module>xplan-validator-cli</module> <module>xplan-transform-cli</module> diff --git a/xplan-core/xplan-commons-cli/pom.xml b/xplan-cli/xplan-cli-core/pom.xml similarity index 88% rename from xplan-core/xplan-commons-cli/pom.xml rename to xplan-cli/xplan-cli-core/pom.xml index 1d187bd3c08b16464087aeb7183f3442ef63efdf..fa5b04496623320d5f7d4a644697ff24f2310dc8 100644 --- a/xplan-core/xplan-commons-cli/pom.xml +++ b/xplan-cli/xplan-cli-core/pom.xml @@ -1,12 +1,12 @@ <?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-commons-cli</artifactId> + <artifactId>xplan-cli-core</artifactId> <description>Commons Paket fuer CLIs</description> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-core</artifactId> + <artifactId>xplan-cli</artifactId> <version>7.2-SNAPSHOT</version> </parent> diff --git a/xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/DatabaseUtils.java b/xplan-cli/xplan-cli-core/src/main/java/de/latlon/xplan/commons/cli/DatabaseUtils.java similarity index 100% rename from xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/DatabaseUtils.java rename to xplan-cli/xplan-cli-core/src/main/java/de/latlon/xplan/commons/cli/DatabaseUtils.java diff --git a/xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/Operation.java b/xplan-cli/xplan-cli-core/src/main/java/de/latlon/xplan/commons/cli/Operation.java similarity index 100% rename from xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/Operation.java rename to xplan-cli/xplan-cli-core/src/main/java/de/latlon/xplan/commons/cli/Operation.java diff --git a/xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizationException.java b/xplan-cli/xplan-cli-core/src/main/java/de/latlon/xplan/commons/cli/SynchronizationException.java similarity index 100% rename from xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizationException.java rename to xplan-cli/xplan-cli-core/src/main/java/de/latlon/xplan/commons/cli/SynchronizationException.java diff --git a/xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizeAllExecutor.java b/xplan-cli/xplan-cli-core/src/main/java/de/latlon/xplan/commons/cli/SynchronizeAllExecutor.java similarity index 100% rename from xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizeAllExecutor.java rename to xplan-cli/xplan-cli-core/src/main/java/de/latlon/xplan/commons/cli/SynchronizeAllExecutor.java diff --git a/xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizeExecutor.java b/xplan-cli/xplan-cli-core/src/main/java/de/latlon/xplan/commons/cli/SynchronizeExecutor.java similarity index 100% rename from xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizeExecutor.java rename to xplan-cli/xplan-cli-core/src/main/java/de/latlon/xplan/commons/cli/SynchronizeExecutor.java diff --git a/xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/Synchronizer.java b/xplan-cli/xplan-cli-core/src/main/java/de/latlon/xplan/commons/cli/Synchronizer.java similarity index 100% rename from xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/Synchronizer.java rename to xplan-cli/xplan-cli-core/src/main/java/de/latlon/xplan/commons/cli/Synchronizer.java diff --git a/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml b/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml index d883c4a86dcb1a0e1506cf31e5a11228d983bcbd..69de37a090f2a85947d2e4efc6a83652d0701bd4 100644 --- a/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml +++ b/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml @@ -111,7 +111,7 @@ </dependency> <dependency> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-commons-cli</artifactId> + <artifactId>xplan-cli-core</artifactId> <scope>compile</scope> <exclusions> <exclusion> diff --git a/xplan-cli/xplan-manager-cli/pom.xml b/xplan-cli/xplan-manager-cli/pom.xml index e73362a09f1684f0437a12cc15eeb8c4c80936d7..3c4754fda156ec55b8190bc4f500f04dea9586bd 100644 --- a/xplan-cli/xplan-manager-cli/pom.xml +++ b/xplan-cli/xplan-manager-cli/pom.xml @@ -101,18 +101,15 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-manager-core</artifactId> - <version>${project.version}</version> + <artifactId>xplan-core-manager</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> - <version>${project.version}</version> + <artifactId>xplan-core-commons</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-validator-core</artifactId> - <version>${project.version}</version> + <artifactId>xplan-core-validator</artifactId> </dependency> <dependency> <groupId>de.latlon</groupId> diff --git a/xplan-cli/xplan-transform-cli/pom.xml b/xplan-cli/xplan-transform-cli/pom.xml index 70162eb8e29e269692ed154dbb374030e069a239..5d950c6a6b232e769d2142e86e0090934d8131c1 100644 --- a/xplan-cli/xplan-transform-cli/pom.xml +++ b/xplan-cli/xplan-transform-cli/pom.xml @@ -100,15 +100,15 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-manager-core</artifactId> + <artifactId>xplan-core-manager</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons-cli</artifactId> + <artifactId>xplan-cli-core</artifactId> </dependency> <dependency> <groupId>de.latlon</groupId> diff --git a/xplan-cli/xplan-update-data-cli/pom.xml b/xplan-cli/xplan-update-data-cli/pom.xml index bec2b00f171397ad16817c3f8ecf19d572b37a0d..302a50a808a7ce492b13e77d17d1c0f71949a034 100644 --- a/xplan-cli/xplan-update-data-cli/pom.xml +++ b/xplan-cli/xplan-update-data-cli/pom.xml @@ -113,11 +113,11 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-manager-core</artifactId> + <artifactId>xplan-core-manager</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> </dependency> <dependency> <groupId>de.latlon</groupId> diff --git a/xplan-cli/xplan-validatedb-cli/pom.xml b/xplan-cli/xplan-validatedb-cli/pom.xml index 996707a836226ead5f50bfd340a8b75a2b062817..f2706c57ed12e02be5f1efb7f4628849ce9bc11f 100644 --- a/xplan-cli/xplan-validatedb-cli/pom.xml +++ b/xplan-cli/xplan-validatedb-cli/pom.xml @@ -99,15 +99,15 @@ <dependencies> <dependency> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> </dependency> <dependency> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-manager-core</artifactId> + <artifactId>xplan-core-manager</artifactId> </dependency> <dependency> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-validator-core</artifactId> + <artifactId>xplan-core-validator</artifactId> <exclusions> <exclusion> <groupId>de.latlon.product.xplanbox</groupId> diff --git a/xplan-cli/xplan-validator-cli/pom.xml b/xplan-cli/xplan-validator-cli/pom.xml index 5502f6c7fdc3e6e2f8a6e9191f15b865c5684cf4..96ec66ac85d4279db4f22f5efd510c3e2974e2c5 100644 --- a/xplan-cli/xplan-validator-cli/pom.xml +++ b/xplan-cli/xplan-validator-cli/pom.xml @@ -88,7 +88,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-validator-core</artifactId> + <artifactId>xplan-core-validator</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/xplan-configuration/pom.xml b/xplan-configuration/pom.xml deleted file mode 100644 index fcf1005f672a745b2c6a2e2340ae991a376c4e63..0000000000000000000000000000000000000000 --- a/xplan-configuration/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <artifactId>xplan-configuration</artifactId> - <packaging>pom</packaging> - <description>Modul zur Gruppierung der Konfiguration</description> - - <parent> - <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplanbox</artifactId> - <version>7.2-SNAPSHOT</version> - </parent> - - <modules> - <module>xplan-manager-config</module> - <module>xplan-validator-config</module> - <module>xplan-dokumenten-config</module> - <module>xplan-mapserver-config</module> - <module>xplan-mapproxy-config</module> - </modules> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>zip</id> - <goals> - <goal>single</goal> - </goals> - <configuration> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <descriptors> - <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - <phase>package</phase> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - -</project> diff --git a/xplan-configuration/xplan-dokumenten-config/pom.xml b/xplan-configuration/xplan-dokumenten-config/pom.xml deleted file mode 100644 index 65db83d0985348264ad62087b37ffddf65eff607..0000000000000000000000000000000000000000 --- a/xplan-configuration/xplan-dokumenten-config/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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-dokumenten-config</artifactId> - <packaging>pom</packaging> - - <parent> - <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-configuration</artifactId> - <version>7.2-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-core/pom.xml b/xplan-core/pom.xml index 6f7f94a2a472f481b7ebe89f5d8d1ae1113d9f23..e2aaef742f3b76a0c3c97e2d21bed0c848f2d941 100644 --- a/xplan-core/pom.xml +++ b/xplan-core/pom.xml @@ -12,15 +12,18 @@ </parent> <modules> - <module>xplan-commons</module> - <module>xplan-inspireplu-transformation</module> - <module>xplan-manager-core</module> - <module>xplan-synthesizer</module> - <module>xplan-validator-core</module> - <module>xplan-commons-cli</module> + <module>xplan-core-api</module> + <module>xplan-core-commons</module> + <module>xplan-core-gwt</module> + <module>xplan-core-inspireplu</module> <module>xplan-core-job</module> + <module>xplan-core-manager</module> <module>xplan-core-manager-db</module> <module>xplan-core-manager-deegree</module> + <module>xplan-core-schemas</module> + <module>xplan-core-security</module> + <module>xplan-core-synthesizer</module> + <module>xplan-core-validator</module> </modules> </project> diff --git a/xplan-api/README.md b/xplan-core/xplan-core-api/README.md similarity index 100% rename from xplan-api/README.md rename to xplan-core/xplan-core-api/README.md diff --git a/xplan-api/xplan-api-commons/pom.xml b/xplan-core/xplan-core-api/pom.xml similarity index 90% rename from xplan-api/xplan-api-commons/pom.xml rename to xplan-core/xplan-core-api/pom.xml index a5ee2764fad2e978955e294ec36e5d344987d150..89577514edf2e7acf23f93bbe9619e04daf564ca 100644 --- a/xplan-api/xplan-api-commons/pom.xml +++ b/xplan-core/xplan-core-api/pom.xml @@ -1,19 +1,18 @@ <?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-api-commons</artifactId> - <description>xplan-api-commons</description> + <artifactId>xplan-core-api</artifactId> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-api</artifactId> + <artifactId>xplan-core</artifactId> <version>7.2-SNAPSHOT</version> </parent> <dependencies> <dependency> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-validator-core</artifactId> + <artifactId>xplan-core-validator</artifactId> </dependency> <dependency> <groupId>jakarta.ws.rs</groupId> diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/ObjectMapperContextResolver.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/ObjectMapperContextResolver.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/ObjectMapperContextResolver.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/ObjectMapperContextResolver.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/ValidationReportBuilder.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/ValidationReportBuilder.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/ValidationReportBuilder.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/ValidationReportBuilder.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/ValidatorConverter.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/ValidatorConverter.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/ValidatorConverter.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/ValidatorConverter.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/XPlanBoxMediaType.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/XPlanBoxMediaType.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/XPlanBoxMediaType.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/XPlanBoxMediaType.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/config/ApiConfiguration.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/config/ApiConfiguration.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/config/ApiConfiguration.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/config/ApiConfiguration.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/converter/StringListConverter.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/converter/StringListConverter.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/converter/StringListConverter.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/converter/StringListConverter.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/converter/StringListConverterProvider.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/converter/StringListConverterProvider.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/converter/StringListConverterProvider.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/converter/StringListConverterProvider.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/ConstraintViolationExceptionMapper.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/ConstraintViolationExceptionMapper.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/ConstraintViolationExceptionMapper.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/ConstraintViolationExceptionMapper.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/InvalidPlanId.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/InvalidPlanId.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/InvalidPlanId.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/InvalidPlanId.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/InvalidPlanIdSyntax.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/InvalidPlanIdSyntax.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/InvalidPlanIdSyntax.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/InvalidPlanIdSyntax.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/InvalidXPlanGmlOrArchive.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/InvalidXPlanGmlOrArchive.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/InvalidXPlanGmlOrArchive.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/InvalidXPlanGmlOrArchive.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/StatusCodes.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/StatusCodes.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/StatusCodes.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/StatusCodes.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/UnsupportedContentTypeExceptionMapper.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/UnsupportedContentTypeExceptionMapper.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/UnsupportedContentTypeExceptionMapper.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/UnsupportedContentTypeExceptionMapper.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/UnsupportedHeaderValue.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/UnsupportedHeaderValue.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/UnsupportedHeaderValue.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/UnsupportedHeaderValue.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/UnsupportedParameterValue.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/UnsupportedParameterValue.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/UnsupportedParameterValue.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/UnsupportedParameterValue.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/ValidatorExceptionMapper.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/ValidatorExceptionMapper.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/ValidatorExceptionMapper.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/ValidatorExceptionMapper.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/XPlanApiException.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/XPlanApiException.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/XPlanApiException.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/XPlanApiException.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/XPlanApiExceptionMapper.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/XPlanApiExceptionMapper.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/exception/XPlanApiExceptionMapper.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/exception/XPlanApiExceptionMapper.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/handler/SystemConfigHandler.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/handler/SystemConfigHandler.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/handler/SystemConfigHandler.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/handler/SystemConfigHandler.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/openapi/OpenApiFilter.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/openapi/OpenApiFilter.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/openapi/OpenApiFilter.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/openapi/OpenApiFilter.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/DocumentSummary.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/DocumentSummary.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/DocumentSummary.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/DocumentSummary.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ExternalReferenceResult.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ExternalReferenceResult.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ExternalReferenceResult.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ExternalReferenceResult.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ExternalReferenceStatusEnum.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ExternalReferenceStatusEnum.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ExternalReferenceStatusEnum.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ExternalReferenceStatusEnum.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/PlanInfoBbox.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/PlanInfoBbox.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/PlanInfoBbox.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/PlanInfoBbox.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/RulesMetadata.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/RulesMetadata.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/RulesMetadata.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/RulesMetadata.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/SemanticInvalidRuleResult.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/SemanticInvalidRuleResult.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/SemanticInvalidRuleResult.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/SemanticInvalidRuleResult.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/SystemConfig.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/SystemConfig.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/SystemConfig.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/SystemConfig.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReport.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReport.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReport.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReport.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResult.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResult.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResult.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResult.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultGeometrisch.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultGeometrisch.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultGeometrisch.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultGeometrisch.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSemantisch.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSemantisch.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSemantisch.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSemantisch.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSemantischProfil.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSemantischProfil.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSemantischProfil.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSemantischProfil.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSemantischRules.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSemantischRules.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSemantischRules.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSemantischRules.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSyntaktisch.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSyntaktisch.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSyntaktisch.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/ValidationReportValidationResultSyntaktisch.java diff --git a/xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/VersionEnum.java b/xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/VersionEnum.java similarity index 100% rename from xplan-api/xplan-api-commons/src/main/java/de/latlon/xplanbox/api/commons/v1/model/VersionEnum.java rename to xplan-core/xplan-core-api/src/main/java/de/latlon/xplanbox/api/commons/v1/model/VersionEnum.java diff --git a/xplan-api/xplan-api-commons/src/test/java/de/latlon/xplanbox/api/commons/ValidationReportBuilderTest.java b/xplan-core/xplan-core-api/src/test/java/de/latlon/xplanbox/api/commons/ValidationReportBuilderTest.java similarity index 100% rename from xplan-api/xplan-api-commons/src/test/java/de/latlon/xplanbox/api/commons/ValidationReportBuilderTest.java rename to xplan-core/xplan-core-api/src/test/java/de/latlon/xplanbox/api/commons/ValidationReportBuilderTest.java diff --git a/xplan-api/xplan-api-commons/src/test/java/de/latlon/xplanbox/api/commons/ValidatorConverterTest.java b/xplan-core/xplan-core-api/src/test/java/de/latlon/xplanbox/api/commons/ValidatorConverterTest.java similarity index 100% rename from xplan-api/xplan-api-commons/src/test/java/de/latlon/xplanbox/api/commons/ValidatorConverterTest.java rename to xplan-core/xplan-core-api/src/test/java/de/latlon/xplanbox/api/commons/ValidatorConverterTest.java diff --git a/xplan-api/xplan-api-commons/src/test/java/de/latlon/xplanbox/api/commons/openapi/OpenApiFilterTest.java b/xplan-core/xplan-core-api/src/test/java/de/latlon/xplanbox/api/commons/openapi/OpenApiFilterTest.java similarity index 100% rename from xplan-api/xplan-api-commons/src/test/java/de/latlon/xplanbox/api/commons/openapi/OpenApiFilterTest.java rename to xplan-core/xplan-core-api/src/test/java/de/latlon/xplanbox/api/commons/openapi/OpenApiFilterTest.java diff --git a/xplan-core/xplan-core-commons/LICENSE_UNKNOWN.txt b/xplan-core/xplan-core-commons/LICENSE_UNKNOWN.txt new file mode 100644 index 0000000000000000000000000000000000000000..9bb455eacc25b95d62330738857f7a7085c7bad0 --- /dev/null +++ b/xplan-core/xplan-core-commons/LICENSE_UNKNOWN.txt @@ -0,0 +1,66 @@ +Hinweis: +======== + +Die Testdaten im Verzeichnis src/test/resources werden zu Testzwecken verwendet. +Zu diesen Dateien können keine genaueren Angaben zur Quelle und zu etwaigen Nutzungsrechten angegeben werden. Eine Weitergabe an +Dritte ausser zu Testzwecken der Anwendung xPlanBox ist nicht gestattet. + +Inhalt des Verzeichnisses src/test/resources: +--------------------------------------------- +├── de +│  └── latlon +│  └── xplan +│  └── commons +│  ├── archive +│  │  ├── Blankenese29_Test_60_withEntity.zip +│  │  ├── V4_1_ID_103-asWfsFeatureCollection.gml +│  │  └── V4_1_ID_103-noXPlanGmlCollection.gml +│  ├── feature +│  │  ├── geometryOrientationInvalid.gml +│  │  ├── geometryOrientationValid.gml +│  │  ├── wfs20FeatureCollection-additionalObjects.gml +│  │  ├── wfs20FeatureCollection.gml +│  │  ├── xplan-multipleInstances.gml +│  │  ├── xplan-multipleInstances-withUnreferenced.gml +│  │  └── xplan-multipleInstances-withVerbundenerPlan.gml +│  └── util +│  ├── Blankenese29.pgw +│  ├── Blankenese29.png +│  ├── Blankenese29_Test_60_InvalidContent.zip +│  ├── Blankenese29_Test_60.zip +│  └── test.odt +└── testdata + ├── xplan40 + │  └── BPlan004_4-0.zip + ├── xplan41 + │  ├── BP2070.zip + │  ├── BP2135.zip + │  ├── BPlan001_4-1.zip + │  ├── Demo.zip + │  ├── Eidelstedt_4_V4-Eimsbuettel.zip + │  ├── Eidelstedt_4_V4-wrongGmlFileName.zip + │  ├── Eidelstedt_4_V4.zip + │  ├── Erhaltung.zip + │  ├── FPlan-with-wirksamkeitsDatum.zip + │  ├── FPlan.zip + │  ├── LA22.zip + │  └── LA67.zip + ├── xplan50 + │  ├── BP2070.zip + │  ├── BP2135.zip + │  ├── BPlan004_5-0.zip + │  ├── FPlan.zip + │  ├── LA22.zip + │  └── LA67.zip + ├── xplan51 + │  ├── BP2070_mehrererOrtsteile.zip + │  ├── BP2070.zip + │  ├── BP2135.zip + │  ├── BPlan001_5-1.gml + │  ├── BPlan002_5-1_rasterBasisAlsRefScan.zip + │  ├── BPlan002_5-1.zip + │  ├── FPlan.zip + │  ├── LA22.zip + │  └── LA67.zip + └── xplan52 + └── BPlan001_5-2_Bereiche.zip \ No newline at end of file diff --git a/xplan-core/xplan-commons/pom.xml b/xplan-core/xplan-core-commons/pom.xml similarity index 93% rename from xplan-core/xplan-commons/pom.xml rename to xplan-core/xplan-core-commons/pom.xml index 0f03104757a99dc38f6011ae19d98e21baaa3fd4..4f7e6a0375aaeebd67c387545dcce381ff58b46c 100644 --- a/xplan-core/xplan-commons/pom.xml +++ b/xplan-core/xplan-core-commons/pom.xml @@ -1,7 +1,7 @@ <?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-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> <packaging>jar</packaging> <description>Commons Paket fuer XPlan Manager und XPlan Validator</description> @@ -91,12 +91,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-schemas</artifactId> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>xplan-tests-resources</artifactId> - <scope>test</scope> + <artifactId>xplan-core-schemas</artifactId> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/XPlanSchemas.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/XPlanSchemas.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/XPlanSchemas.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/XPlanSchemas.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/XPlanType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/XPlanType.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/XPlanType.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/XPlanType.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/XPlanVersion.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/XPlanVersion.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/XPlanVersion.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/XPlanVersion.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveEntry.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveEntry.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveEntry.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveEntry.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveMetadata.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveMetadata.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveMetadata.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveMetadata.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveZipEntry.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveZipEntry.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveZipEntry.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveZipEntry.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArtefactEntry.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArtefactEntry.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArtefactEntry.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArtefactEntry.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/LocalCenterToDistrictMapper.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/LocalCenterToDistrictMapper.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/LocalCenterToDistrictMapper.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/LocalCenterToDistrictMapper.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/MainZipEntry.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/MainZipEntry.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/MainZipEntry.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/MainZipEntry.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/SemanticValidableXPlanArchive.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/SemanticValidableXPlanArchive.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/SemanticValidableXPlanArchive.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/SemanticValidableXPlanArchive.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchive.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchive.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchive.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchive.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveContentAccess.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveContentAccess.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveContentAccess.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveContentAccess.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveCreator.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveCreator.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveCreator.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveCreator.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlReader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlReader.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlReader.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlReader.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlWriterFilter.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlWriterFilter.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlWriterFilter.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlWriterFilter.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanPartArchive.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanPartArchive.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanPartArchive.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanPartArchive.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ZipEntryWithContent.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ZipEntryWithContent.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ZipEntryWithContent.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ZipEntryWithContent.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/AbstractPropertiesLoader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/AbstractPropertiesLoader.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/AbstractPropertiesLoader.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/AbstractPropertiesLoader.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/ConfigurationDirectoryPropertiesLoader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/ConfigurationDirectoryPropertiesLoader.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/ConfigurationDirectoryPropertiesLoader.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/ConfigurationDirectoryPropertiesLoader.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/DefaultPropertiesLoader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/DefaultPropertiesLoader.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/DefaultPropertiesLoader.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/DefaultPropertiesLoader.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/PropertiesLoader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/PropertiesLoader.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/PropertiesLoader.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/PropertiesLoader.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfiguration.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfiguration.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfiguration.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfiguration.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/SortConfiguration.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/SortConfiguration.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/SortConfiguration.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/SortConfiguration.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoader.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoader.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoader.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionParseException.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionParseException.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionParseException.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionParseException.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/MultipleInstanceParser.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/MultipleInstanceParser.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/MultipleInstanceParser.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/MultipleInstanceParser.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/OrientationFixer.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/OrientationFixer.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/OrientationFixer.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/OrientationFixer.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/SortPropertyReader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/SortPropertyReader.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/SortPropertyReader.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/SortPropertyReader.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/WfsFeatureInputStream.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/WfsFeatureInputStream.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/WfsFeatureInputStream.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/WfsFeatureInputStream.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollection.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollection.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollection.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollection.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollectionBuilder.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollectionBuilder.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollectionBuilder.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollectionBuilder.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollections.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollections.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollections.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollections.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParser.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParser.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParser.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParser.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParserBuilder.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParserBuilder.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParserBuilder.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParserBuilder.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanMultipleInstanceFeatureCollection.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanMultipleInstanceFeatureCollection.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanMultipleInstanceFeatureCollection.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanMultipleInstanceFeatureCollection.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanSingleInstanceFeatureCollection.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanSingleInstanceFeatureCollection.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanSingleInstanceFeatureCollection.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanSingleInstanceFeatureCollection.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/hale/HaleIOProvider.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/hale/HaleIOProvider.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/hale/HaleIOProvider.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/hale/HaleIOProvider.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/hale/HaleTransformer.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/hale/HaleTransformer.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/hale/HaleTransformer.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/hale/HaleTransformer.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/hale/TransformationException.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/hale/TransformationException.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/hale/TransformationException.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/hale/TransformationException.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/jts/JtsParser.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/jts/JtsParser.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/jts/JtsParser.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/jts/JtsParser.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReference.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReference.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReference.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReference.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfo.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfo.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfo.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfo.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfoBuilder.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfoBuilder.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfoBuilder.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfoBuilder.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceScanner.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceScanner.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceScanner.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceScanner.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/synthesizer/Features.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/synthesizer/Features.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/synthesizer/Features.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/synthesizer/Features.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/ContentTypeChecker.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/ContentTypeChecker.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/ContentTypeChecker.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/ContentTypeChecker.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/FeatureCollectionUtils.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/FeatureCollectionUtils.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/FeatureCollectionUtils.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/FeatureCollectionUtils.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/MimeTypeDetector.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/MimeTypeDetector.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/MimeTypeDetector.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/MimeTypeDetector.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/TextPatternConstants.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/TextPatternConstants.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/TextPatternConstants.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/TextPatternConstants.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/UnsupportedContentTypeException.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/UnsupportedContentTypeException.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/UnsupportedContentTypeException.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/UnsupportedContentTypeException.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/XPlanVersionUtils.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/XPlanVersionUtils.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/XPlanVersionUtils.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/XPlanVersionUtils.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/AdditionalPlanData.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/AdditionalPlanData.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/AdditionalPlanData.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/AdditionalPlanData.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/AuthorizationInfo.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/AuthorizationInfo.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/AuthorizationInfo.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/AuthorizationInfo.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/Bereich.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/Bereich.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/Bereich.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/Bereich.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/ConfigurationException.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/ConfigurationException.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/ConfigurationException.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/ConfigurationException.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanNameWithStatusResult.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanNameWithStatusResult.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanNameWithStatusResult.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanNameWithStatusResult.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanStatus.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanStatus.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanStatus.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanStatus.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/RasterEvaluationResult.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/RasterEvaluationResult.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/RasterEvaluationResult.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/RasterEvaluationResult.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/Rechtsstand.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/Rechtsstand.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/Rechtsstand.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/Rechtsstand.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/XPlan.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/XPlan.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/XPlan.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/XPlan.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/AbstractReference.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/AbstractReference.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/AbstractReference.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/AbstractReference.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/BaseData.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/BaseData.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/BaseData.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/BaseData.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Change.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Change.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Change.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Change.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ChangeType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ChangeType.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ChangeType.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ChangeType.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ExterneReferenzArt.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ExterneReferenzArt.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ExterneReferenzArt.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ExterneReferenzArt.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/MimeTypes.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/MimeTypes.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/MimeTypes.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/MimeTypes.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterBasis.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterBasis.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterBasis.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterBasis.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReference.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReference.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReference.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReference.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReferenceType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReferenceType.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReferenceType.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReferenceType.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Reference.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Reference.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Reference.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Reference.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ReferenceType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ReferenceType.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ReferenceType.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ReferenceType.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Text.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Text.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Text.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Text.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterType.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterType.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterType.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ArtifactType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ArtifactType.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ArtifactType.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ArtifactType.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/MapPreviewMetadata.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/MapPreviewMetadata.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/MapPreviewMetadata.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/MapPreviewMetadata.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationOption.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationOption.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationOption.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationOption.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationSettings.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationSettings.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationSettings.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationSettings.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationType.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationType.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationType.java diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/XPlanEnvelope.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/XPlanEnvelope.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/XPlanEnvelope.java rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/XPlanEnvelope.java diff --git a/xplan-core/xplan-commons/src/main/java/org/deegree/gml/XPlanGmlFeatureWriter.java b/xplan-core/xplan-core-commons/src/main/java/org/deegree/gml/XPlanGmlFeatureWriter.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/org/deegree/gml/XPlanGmlFeatureWriter.java rename to xplan-core/xplan-core-commons/src/main/java/org/deegree/gml/XPlanGmlFeatureWriter.java diff --git a/xplan-core/xplan-commons/src/main/java/org/deegree/gml/XPlanGmlWriter.java b/xplan-core/xplan-core-commons/src/main/java/org/deegree/gml/XPlanGmlWriter.java similarity index 100% rename from xplan-core/xplan-commons/src/main/java/org/deegree/gml/XPlanGmlWriter.java rename to xplan-core/xplan-core-commons/src/main/java/org/deegree/gml/XPlanGmlWriter.java diff --git a/xplan-core/xplan-commons/src/main/resources/de/latlon/xplan/commons/minimalist-format.json b/xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/commons/minimalist-format.json similarity index 100% rename from xplan-core/xplan-commons/src/main/resources/de/latlon/xplan/commons/minimalist-format.json rename to xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/commons/minimalist-format.json diff --git a/xplan-core/xplan-commons/src/main/resources/de/latlon/xplan/commons/util/contentTypeChecker.properties b/xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/commons/util/contentTypeChecker.properties similarity index 100% rename from xplan-core/xplan-commons/src/main/resources/de/latlon/xplan/commons/util/contentTypeChecker.properties rename to xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/commons/util/contentTypeChecker.properties diff --git a/xplan-webapps/xplan-commons-web/src/main/resources/de/latlon/xplan/commons/XPlanCommonsWeb.gwt.xml b/xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/manager/XPlanManagerCore.gwt.xml similarity index 72% rename from xplan-webapps/xplan-commons-web/src/main/resources/de/latlon/xplan/commons/XPlanCommonsWeb.gwt.xml rename to xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/manager/XPlanManagerCore.gwt.xml index 7f1a06b588c4bcc88ca1fab44880549a43065d14..0d065c091be06997dba0b0b483015b83039dc2e8 100644 --- a/xplan-webapps/xplan-commons-web/src/main/resources/de/latlon/xplan/commons/XPlanCommonsWeb.gwt.xml +++ b/xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/manager/XPlanManagerCore.gwt.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - xplan-commons-web - Modul zur Gruppierung aller Webapps + xplan-commons - Commons Paket fuer XPlan Manager und XPlan Validator %% Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH %% @@ -9,18 +9,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% --> -<module> - <inherits name='com.google.gwt.user.User' /> - <source path="web"></source> -</module> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN" + "http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd"> +<module rename-to='XPlanManagerCore'> + + <source path='web'/> + +</module> diff --git a/xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/validator/XPlanValidatorCore.gwt.xml b/xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/validator/XPlanValidatorCore.gwt.xml new file mode 100644 index 0000000000000000000000000000000000000000..27bb38ef07f69576aab1a9a8f2e0f8514fb8d742 --- /dev/null +++ b/xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/validator/XPlanValidatorCore.gwt.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + xplan-commons - Commons Paket fuer XPlan Manager und XPlan Validator + %% + Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN" + "http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd"> +<module rename-to='XPlanValidatorCore'> + + <source path='web'/> + +</module> diff --git a/xplan-core/xplan-commons/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml b/xplan-core/xplan-core-commons/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml similarity index 100% rename from xplan-core/xplan-commons/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml rename to xplan-core/xplan-core-commons/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java similarity index 99% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java index a04715f1db801242da2e4194536a6cf633046a22..ae4503beb00b4b3770c756d5a6fbe20a42e0a1cd 100644 --- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java +++ b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.commons; -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.XPlanFeatureCollection; @@ -194,7 +193,7 @@ class XPlanFeatureCollectionTest { private XPlanFeatureCollection getMainFileAsXplanFeatureCollection(String name) throws Exception { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchive archive = archiveCreator.createXPlanArchiveFromZip(name, - ResourceAccessor.readResourceStream(name)); + getClass().getResourceAsStream("/testdata/" + name)); return XPlanGmlParserBuilder.newBuilder().build().parseXPlanFeatureCollection(archive); } diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java similarity index 94% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java index 6e142dca18ed021b4e21ad5004671afb8d4ed807..badc7a5c5ef7b871e766a091b7a64434f4e96ad5 100644 --- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java +++ b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java @@ -20,7 +20,6 @@ */ 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.jupiter.api.Test; @@ -146,7 +145,7 @@ class XPlanArchiveCreatorTest { } @Test - void testPlanWithWrongGmlFileNameShouldThrowIllegalArgumentException() throws Exception { + void testPlanWithWrongGmlFileNameShouldThrowIllegalArgumentException() { assertThrows(IllegalArgumentException.class, () -> getTestArchive("xplan41/Eidelstedt_4_V4-wrongGmlFileName.zip")); } @@ -154,7 +153,7 @@ class XPlanArchiveCreatorTest { @Test void testCreateXPlanArchive_51_GmlFile() throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(mockMapper()); - InputStream gmlAsStream = ResourceAccessor.readResourceStream("xplan51/BPlan001_5-1.gml"); + InputStream gmlAsStream = getClass().getResourceAsStream("/testdata/xplan51/BPlan001_5-1.gml"); XPlanArchive archive = archiveCreator.createXPlanArchiveFromGml("BPlan001_5-1.gml", gmlAsStream); assertEquals(XPLAN_51, archive.getVersion()); assertEquals(null, archive.getDistricts().get(0)); @@ -184,7 +183,7 @@ class XPlanArchiveCreatorTest { } @Test - void testCreateXPlanArchive_NoXPlanGml() throws IOException { + void testCreateXPlanArchive_NoXPlanGml() { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(mockMapper()); InputStream gmlAsStream = XPlanArchiveCreatorTest.class .getResourceAsStream("V4_1_ID_103-noXPlanGmlCollection.gml"); @@ -193,7 +192,7 @@ class XPlanArchiveCreatorTest { } @Test - void testCreateXPlanArchive_withEntity() throws IOException { + void testCreateXPlanArchive_withEntity() { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(mockMapper()); InputStream zipAsStream = XPlanArchiveCreatorTest.class .getResourceAsStream("Blankenese29_Test_60_withEntity.zip"); @@ -203,12 +202,12 @@ class XPlanArchiveCreatorTest { private XPlanArchive getTestArchive(String name) throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); + return archiveCreator.createXPlanArchiveFromZip(name, getClass().getResourceAsStream("/testdata/" + name)); } private XPlanArchive getTestArchiveWithMapper(String name) throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(mockMapper()); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); + return archiveCreator.createXPlanArchiveFromZip(name, getClass().getResourceAsStream("/testdata/" + name)); } private LocalCenterToDistrictMapper mockMapper() { diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java similarity index 100% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java similarity index 100% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java similarity index 100% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.java similarity index 100% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.java diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java similarity index 100% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java similarity index 96% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java index 2e840c44bc7a3cfb697996908d8f996786c8916d..290174c1502495c3708b61161c90cb03240c3768 100644 --- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java +++ b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java @@ -20,19 +20,17 @@ */ package de.latlon.xplan.commons.feature; -import static org.junit.jupiter.api.Assertions.assertNull; +import de.latlon.xplan.commons.archive.XPlanArchive; +import de.latlon.xplan.commons.archive.XPlanArchiveCreator; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import java.io.IOException; import java.util.Arrays; import java.util.List; -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; +import static org.junit.jupiter.api.Assertions.assertNull; /** * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a> @@ -85,7 +83,7 @@ class ParameterizedXPlanGmlParserTest { private XPlanArchive getTestArchive(String name) throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); + return archiveCreator.createXPlanArchiveFromZip(name, getClass().getResourceAsStream("/testdata/" + name)); } } diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java similarity index 96% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java index 4dc33de610973b54120e936783b64e1ad296ba17..85d97bdd9a49683f2bad0fc639658c5ab33cf236 100644 --- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java +++ b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java @@ -20,7 +20,6 @@ */ 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 de.latlon.xplan.commons.configuration.SortConfiguration; @@ -91,7 +90,7 @@ class SortPropertyReaderTest { } @Test - void testReadSortDate_NullSortConfiguration() throws Exception { + void testReadSortDate_NullSortConfiguration() { assertThrows(NullPointerException.class, () -> new SortPropertyReader(null)); } @@ -106,7 +105,7 @@ class SortPropertyReaderTest { String name = "xplan51/BP2070.zip"; XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchive archive = archiveCreator.createXPlanArchiveFromZip(name, - ResourceAccessor.readResourceStream(name)); + getClass().getResourceAsStream("/testdata/" + name)); return XPlanGmlParserBuilder.newBuilder().build().parseFeatureCollection(archive); } diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java similarity index 96% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java index 92fe08b8df535b67368270c077777c5101c36849..66495171763298ea575cc9b02d9d4543cd3bb66f 100644 --- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java +++ b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java @@ -20,7 +20,6 @@ */ 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 de.latlon.xplan.commons.util.XPlanVersionUtils; @@ -98,7 +97,7 @@ class XPlanGmlParserTest { private XPlanArchive getTestArchive(String name) throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); + return archiveCreator.createXPlanArchiveFromZip(name, getClass().getResourceAsStream("/testdata/" + name)); } private XPlanArchive getArchive(String name) throws IOException { diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java similarity index 96% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java index c564d9c6c20e898a9041088093632f3c223d330e..3572a415bbabddca7dd4b9fde5bbe17b6abf1cb5 100644 --- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java +++ b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java @@ -20,19 +20,17 @@ */ package de.latlon.xplan.commons.reference; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.Arrays; -import java.util.List; - +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.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; +import java.util.Arrays; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a> @@ -59,7 +57,7 @@ class ParameterizedExternalReferenceScannerTest { private FeatureCollection getMainFileAsFeatureCollection(String name) throws Exception { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchive archive = archiveCreator.createXPlanArchiveFromZip(name, - ResourceAccessor.readResourceStream(name)); + getClass().getResourceAsStream("/testdata/" + name)); return XPlanGmlParserBuilder.newBuilder().build().parseFeatureCollection(archive); } diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java similarity index 100% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java similarity index 98% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java index 884837d48570ac9b3338d2bce2189fd3a16126a0..4378ebb837bc500f3134f9626e39e2831df476f8 100644 --- a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java +++ b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.commons.util; -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; @@ -130,7 +129,7 @@ class FeatureCollectionUtilsTest { private FeatureCollection getMainFileAsFeatureCollection(String name) throws Exception { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchive archive = archiveCreator.createXPlanArchiveFromZip(name, - ResourceAccessor.readResourceStream(name)); + getClass().getResourceAsStream("/testdata/" + name)); return XPlanGmlParserBuilder.newBuilder().build().parseFeatureCollection(archive); } diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java similarity index 100% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java similarity index 100% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java similarity index 100% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java similarity index 100% rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java diff --git a/xplan-core/xplan-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java b/xplan-core/xplan-core-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java similarity index 93% rename from xplan-core/xplan-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java rename to xplan-core/xplan-core-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java index 4df7ffd4db5a8cc976f8270649dda159dff79992..6acb6a448f81a4329b15785b4206028168543141 100644 --- a/xplan-core/xplan-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java +++ b/xplan-core/xplan-core-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java @@ -20,17 +20,14 @@ */ package org.deegree.gml; -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.XPlanFeatureCollection; import de.latlon.xplan.commons.feature.XPlanGmlParserBuilder; -import org.deegree.cs.exceptions.UnknownCRSException; import org.junit.jupiter.api.Test; import org.xmlunit.assertj3.XmlAssert; import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import java.io.ByteArrayOutputStream; import java.util.HashMap; @@ -63,7 +60,7 @@ class XPlanGmlFeatureWriterTest { private XPlanFeatureCollection getMainFileAsXplanFeatureCollection(String name) throws Exception { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchive archive = archiveCreator.createXPlanArchiveFromZip(name, - ResourceAccessor.readResourceStream(name)); + getClass().getResourceAsStream("/testdata/" + name)); return XPlanGmlParserBuilder.newBuilder().build().parseXPlanFeatureCollection(archive); } diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/archive/Blankenese29_Test_60_withEntity.zip b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/archive/Blankenese29_Test_60_withEntity.zip similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/archive/Blankenese29_Test_60_withEntity.zip rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/archive/Blankenese29_Test_60_withEntity.zip diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-asWfsFeatureCollection.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-asWfsFeatureCollection.gml similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-asWfsFeatureCollection.gml rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-asWfsFeatureCollection.gml diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-noXPlanGmlCollection.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-noXPlanGmlCollection.gml similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-noXPlanGmlCollection.gml rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-noXPlanGmlCollection.gml diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationInvalid.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationInvalid.gml similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationInvalid.gml rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationInvalid.gml diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationValid.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationValid.gml similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationValid.gml rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationValid.gml diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection-additionalObjects.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection-additionalObjects.gml similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection-additionalObjects.gml rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection-additionalObjects.gml diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection.gml similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection.gml rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection.gml diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withUnreferenced.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withUnreferenced.gml similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withUnreferenced.gml rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withUnreferenced.gml diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withVerbundenerPlan.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withVerbundenerPlan.gml similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withVerbundenerPlan.gml rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withVerbundenerPlan.gml diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances.gml similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances.gml rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances.gml diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.pgw b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.pgw similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.pgw rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.pgw diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.png b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.png similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.png rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.png diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60.zip b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60.zip similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60.zip rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60.zip diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60_InvalidContent.zip b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60_InvalidContent.zip similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60_InvalidContent.zip rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60_InvalidContent.zip diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/test.odt b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/test.odt similarity index 100% rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/test.odt rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/test.odt diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan40/BPlan004_4-0.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan40/BPlan004_4-0.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan40/BPlan004_4-0.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan40/BPlan004_4-0.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BP2070.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/BP2070.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BP2070.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/BP2070.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BP2135.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/BP2135.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BP2135.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/BP2135.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BPlan001_4-1.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/BPlan001_4-1.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BPlan001_4-1.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/BPlan001_4-1.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Demo.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/Demo.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Demo.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/Demo.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-Eimsbuettel.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/Eidelstedt_4_V4-Eimsbuettel.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-Eimsbuettel.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/Eidelstedt_4_V4-Eimsbuettel.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-wrongGmlFileName.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/Eidelstedt_4_V4-wrongGmlFileName.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-wrongGmlFileName.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/Eidelstedt_4_V4-wrongGmlFileName.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/Eidelstedt_4_V4.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/Eidelstedt_4_V4.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Erhaltung.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/Erhaltung.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Erhaltung.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/Erhaltung.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/FPlan-with-wirksamkeitsDatum.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/FPlan-with-wirksamkeitsDatum.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/FPlan-with-wirksamkeitsDatum.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/FPlan-with-wirksamkeitsDatum.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/FPlan.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/FPlan.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/FPlan.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/FPlan.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/LA22.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/LA22.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/LA22.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/LA22.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/LA67.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/LA67.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/LA67.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan41/LA67.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/BP2070.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan50/BP2070.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/BP2070.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan50/BP2070.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/BP2135.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan50/BP2135.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/BP2135.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan50/BP2135.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/BPlan004_5-0.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan50/BPlan004_5-0.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/BPlan004_5-0.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan50/BPlan004_5-0.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/FPlan.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan50/FPlan.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/FPlan.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan50/FPlan.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/LA22.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan50/LA22.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/LA22.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan50/LA22.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/LA67.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan50/LA67.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/LA67.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan50/LA67.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BP2070.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/BP2070.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BP2070.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/BP2070.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BP2070_mehrererOrtsteile.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/BP2070_mehrererOrtsteile.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BP2070_mehrererOrtsteile.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/BP2070_mehrererOrtsteile.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BP2135.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/BP2135.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BP2135.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/BP2135.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BPlan001_5-1.gml b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/BPlan001_5-1.gml similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BPlan001_5-1.gml rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/BPlan001_5-1.gml diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BPlan002_5-1.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/BPlan002_5-1.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BPlan002_5-1.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/BPlan002_5-1.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BPlan002_5-1_rasterBasisAlsRefScan.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/BPlan002_5-1_rasterBasisAlsRefScan.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BPlan002_5-1_rasterBasisAlsRefScan.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/BPlan002_5-1_rasterBasisAlsRefScan.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/FPlan.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/FPlan.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/FPlan.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/FPlan.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/LA22.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/LA22.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/LA22.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/LA22.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/LA67.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/LA67.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/LA67.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan51/LA67.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/BPlan001_5-2_Bereiche.zip b/xplan-core/xplan-core-commons/src/test/resources/testdata/xplan52/BPlan001_5-2_Bereiche.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/BPlan001_5-2_Bereiche.zip rename to xplan-core/xplan-core-commons/src/test/resources/testdata/xplan52/BPlan001_5-2_Bereiche.zip diff --git a/xplan-webapps/xplan-validator-web-commons/pom.xml b/xplan-core/xplan-core-gwt/pom.xml similarity index 77% rename from xplan-webapps/xplan-validator-web-commons/pom.xml rename to xplan-core/xplan-core-gwt/pom.xml index 97a2312343c2a1916e96059df27bc56fdac50b0e..2720f5415109bb06436b1541ce3053f9176fecb9 100644 --- a/xplan-webapps/xplan-validator-web-commons/pom.xml +++ b/xplan-core/xplan-core-gwt/pom.xml @@ -1,16 +1,32 @@ <?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"> +<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-validator-web-commons</artifactId> + <artifactId>xplan-core-gwt</artifactId> <packaging>jar</packaging> + <description>Modul zur Gruppierung von GWT Komponenten</description> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-webapps</artifactId> + <artifactId>xplan-core</artifactId> <version>7.2-SNAPSHOT</version> </parent> <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> <resources> <resource> <directory>src/main/resources</directory> @@ -45,13 +61,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons-web</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>xplan-validator-core</artifactId> - <version>${project.version}</version> + <artifactId>xplan-core-validator</artifactId> <exclusions> <exclusion> <groupId>jakarta.validation</groupId> @@ -65,7 +75,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> <classifier>sources</classifier> <exclusions> <exclusion> @@ -79,8 +89,8 @@ <artifactId>commons-fileupload</artifactId> <exclusions> <exclusion> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </exclusion> </exclusions> </dependency> diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/PollingTextBox.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/PollingTextBox.java similarity index 90% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/PollingTextBox.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/PollingTextBox.java index 469d62ba3ecff631fffc92e347a11295a7032ccb..2426d5fb13205f0e5ebf6eab5dfd1f2b8b347ba7 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/PollingTextBox.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/PollingTextBox.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,12 +18,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client; +package de.latlon.xplanbox.core.gwt.commons.client; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.TextBox; -import de.latlon.xplan.validator.web.client.service.ValidationServiceAsync; +import de.latlon.xplanbox.core.gwt.commons.client.service.ValidationServiceAsync; /** * @author <a href="mailto:friebe@lat-lon.de">Torsten Friebe</a> diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/ValidationListener.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/ValidationListener.java similarity index 91% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/ValidationListener.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/ValidationListener.java index c8fc6d686c988b3dde74979cb59dc5ec2ab95963..40577b0eafdd9c0b3340ff30b747e55d040e2736 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/ValidationListener.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/ValidationListener.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client; +package de.latlon.xplanbox.core.gwt.commons.client; import de.latlon.xplan.validator.web.shared.ValidationSettings; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/ValidatorOptionsDialog.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/ValidatorOptionsDialog.java similarity index 94% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/ValidatorOptionsDialog.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/ValidatorOptionsDialog.java index 2c28ea32943172058980cc45e4f5351a4d90defa..a61874724d98983bdefc492c9304b1568b94b568 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/ValidatorOptionsDialog.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/ValidatorOptionsDialog.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client; +package de.latlon.xplanbox.core.gwt.commons.client; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; @@ -35,18 +35,18 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.VerticalPanel; -import de.latlon.xplan.validator.web.client.report.ReportDialog; -import de.latlon.xplan.validator.web.client.report.ReportDownloadFinishedListener; -import de.latlon.xplan.validator.web.client.service.MapPreviewConfigService; -import de.latlon.xplan.validator.web.client.service.MapPreviewConfigServiceAsync; -import de.latlon.xplan.validator.web.client.service.ValidationService; -import de.latlon.xplan.validator.web.client.service.ValidationServiceAsync; +import de.latlon.xplanbox.core.gwt.commons.client.report.ReportDialog; +import de.latlon.xplanbox.core.gwt.commons.client.report.ReportDownloadFinishedListener; +import de.latlon.xplanbox.core.gwt.commons.client.service.MapPreviewConfigService; +import de.latlon.xplanbox.core.gwt.commons.client.service.MapPreviewConfigServiceAsync; +import de.latlon.xplanbox.core.gwt.commons.client.service.ValidationService; +import de.latlon.xplanbox.core.gwt.commons.client.service.ValidationServiceAsync; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationConfig; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationSummary; import de.latlon.xplan.validator.web.shared.MapPreviewMetadata; -import de.latlon.xplan.validator.web.shared.ValidationConfig; import de.latlon.xplan.validator.web.shared.ValidationOption; -import de.latlon.xplan.validator.web.shared.ValidationProfile; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationProfile; import de.latlon.xplan.validator.web.shared.ValidationSettings; -import de.latlon.xplan.validator.web.shared.ValidationSummary; import de.latlon.xplan.validator.web.shared.ValidationType; import java.util.ArrayList; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/ValidatorWebCommonsMessages.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/ValidatorWebCommonsMessages.java similarity index 95% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/ValidatorWebCommonsMessages.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/ValidatorWebCommonsMessages.java index 53353b835f41fa2e52cf3540a3a2f5c55fa92822..96de7a4d87f0b9ea307afb5f81d684d91b91f063 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/ValidatorWebCommonsMessages.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/ValidatorWebCommonsMessages.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client; +package de.latlon.xplanbox.core.gwt.commons.client; import com.google.gwt.i18n.client.Messages; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/MasterportalMapPreviewDialog.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/MasterportalMapPreviewDialog.java similarity index 95% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/MasterportalMapPreviewDialog.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/MasterportalMapPreviewDialog.java index 482058e784265de5de7608ace6cda422ba6b7083..07cedbdd3e6e3bc67a8842356fcfa00286a1b33e 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/MasterportalMapPreviewDialog.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/MasterportalMapPreviewDialog.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client.report; +package de.latlon.xplanbox.core.gwt.commons.client.report; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; @@ -28,7 +28,7 @@ import com.google.gwt.user.client.ui.DialogBox; import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.VerticalPanel; -import de.latlon.xplan.validator.web.client.ValidatorWebCommonsMessages; +import de.latlon.xplanbox.core.gwt.commons.client.ValidatorWebCommonsMessages; import de.latlon.xplan.validator.web.shared.MapPreviewMetadata; import de.latlon.xplan.validator.web.shared.XPlanEnvelope; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/ReportDialog.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/ReportDialog.java similarity index 90% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/ReportDialog.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/ReportDialog.java index 2aca18ea090359469c0fc50c8362933a031ad699..e3e63041aae908b286a1958b8dbafc43c9e8399c 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/ReportDialog.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/ReportDialog.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,10 +18,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client.report; +package de.latlon.xplanbox.core.gwt.commons.client.report; -import static de.latlon.xplan.validator.web.client.report.ReportDownloadFinishedListener.FinishStatus.CLOSE; -import static de.latlon.xplan.validator.web.client.report.ReportDownloadFinishedListener.FinishStatus.NEXT; +import static de.latlon.xplanbox.core.gwt.commons.client.report.ReportDownloadFinishedListener.FinishStatus.CLOSE; +import static de.latlon.xplanbox.core.gwt.commons.client.report.ReportDownloadFinishedListener.FinishStatus.NEXT; import java.util.ArrayList; import java.util.List; @@ -37,10 +37,10 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -import de.latlon.xplan.validator.web.client.ValidatorWebCommonsMessages; -import de.latlon.xplan.validator.web.client.report.ReportDownloadFinishedListener.FinishStatus; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationSummary; +import de.latlon.xplanbox.core.gwt.commons.client.ValidatorWebCommonsMessages; +import de.latlon.xplanbox.core.gwt.commons.client.report.ReportDownloadFinishedListener.FinishStatus; import de.latlon.xplan.validator.web.shared.MapPreviewMetadata; -import de.latlon.xplan.validator.web.shared.ValidationSummary; /** * Contains the HTML-Report and allows download of report artefacts as zip. diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/ReportDownloadFinishedListener.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/ReportDownloadFinishedListener.java similarity index 91% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/ReportDownloadFinishedListener.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/ReportDownloadFinishedListener.java index 57539ec1e2875ed2c2d0158f6b6483914f74255a..09f8a51cda462df0366d04d5ade9301544fa6df2 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/ReportDownloadFinishedListener.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/ReportDownloadFinishedListener.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client.report; +package de.latlon.xplanbox.core.gwt.commons.client.report; /** * Indicates that the user finished the report download. diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/ReportDownloadPanel.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/ReportDownloadPanel.java similarity index 93% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/ReportDownloadPanel.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/ReportDownloadPanel.java index 7abde28eddcac47d59e83af065438ede210f1ac0..55c5b78f9bc3d8ea4379bce2f4ae2cfa2fa159a8 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/ReportDownloadPanel.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/ReportDownloadPanel.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client.report; +package de.latlon.xplanbox.core.gwt.commons.client.report; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; @@ -30,9 +30,9 @@ import com.google.gwt.user.client.ui.CheckBox; 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.validator.web.client.ValidatorWebCommonsMessages; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationSummary; +import de.latlon.xplanbox.core.gwt.commons.client.ValidatorWebCommonsMessages; import de.latlon.xplan.validator.web.shared.ArtifactType; -import de.latlon.xplan.validator.web.shared.ValidationSummary; import java.util.ArrayList; import java.util.List; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/ReportUrlBuilder.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/ReportUrlBuilder.java similarity index 92% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/ReportUrlBuilder.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/ReportUrlBuilder.java index ce9e73ce26d9d055db46ac0d37a54903ccc1975f..39bedcf49299251ba986345b48a3b39ad6e54e0b 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/report/ReportUrlBuilder.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/report/ReportUrlBuilder.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,14 +18,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client.report; +package de.latlon.xplanbox.core.gwt.commons.client.report; import java.util.List; import com.google.gwt.core.client.GWT; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationSummary; import de.latlon.xplan.validator.web.shared.ArtifactType; -import de.latlon.xplan.validator.web.shared.ValidationSummary; /** * Contains useful methods to create report urls. diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/MapPreviewConfigService.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/MapPreviewConfigService.java similarity index 87% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/MapPreviewConfigService.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/MapPreviewConfigService.java index 1e065e2085d9cb3c71efaeac27394c653389e70d..dba15a8f09b302980611b8f9cfe83a35f927f9dd 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/MapPreviewConfigService.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/MapPreviewConfigService.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,11 +18,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client.service; +package de.latlon.xplanbox.core.gwt.commons.client.service; import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; -import de.latlon.xplan.validator.web.shared.MapPreviewException; +import de.latlon.xplanbox.core.gwt.commons.shared.MapPreviewException; import de.latlon.xplan.validator.web.shared.MapPreviewMetadata; /** diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/MapPreviewConfigServiceAsync.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/MapPreviewConfigServiceAsync.java similarity index 90% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/MapPreviewConfigServiceAsync.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/MapPreviewConfigServiceAsync.java index 1ca130752b8756755d95685b58b1be8359e6308e..a8c2c3bb97504ad51885034860bd2b085cfce2b5 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/MapPreviewConfigServiceAsync.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/MapPreviewConfigServiceAsync.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client.service; +package de.latlon.xplanbox.core.gwt.commons.client.service; import com.google.gwt.user.client.rpc.AsyncCallback; import de.latlon.xplan.validator.web.shared.MapPreviewMetadata; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/ValidationConfigService.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/ValidationConfigService.java similarity index 86% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/ValidationConfigService.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/ValidationConfigService.java index 49c557ce9dd213bb9e3fa190470b0207e98efe9c..350abc248654b4c0b2b7e1a080f9c8d681301ae6 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/ValidationConfigService.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/ValidationConfigService.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,11 +18,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client.service; +package de.latlon.xplanbox.core.gwt.commons.client.service; import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; -import de.latlon.xplan.validator.web.shared.ValidationConfig; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationConfig; /** * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a> diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/ValidationConfigServiceAsync.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/ValidationConfigServiceAsync.java similarity index 85% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/ValidationConfigServiceAsync.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/ValidationConfigServiceAsync.java index 36e6f8e2bf498fe6f7961348474a82c0489d8453..f4ae0533344f6f24372521b8dea9b1d395838fd5 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/ValidationConfigServiceAsync.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/ValidationConfigServiceAsync.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,10 +18,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client.service; +package de.latlon.xplanbox.core.gwt.commons.client.service; import com.google.gwt.user.client.rpc.AsyncCallback; -import de.latlon.xplan.validator.web.shared.ValidationConfig; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationConfig; /** * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a> diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/ValidationService.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/ValidationService.java similarity index 83% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/ValidationService.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/ValidationService.java index 41a707f1537d61a9c77f8ea73e150bd6b98dcb40..f763927eedb7a0d417b2e32b65b546591c02a3c4 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/ValidationService.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/ValidationService.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,15 +18,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client.service; +package de.latlon.xplanbox.core.gwt.commons.client.service; import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationException; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationSummary; import de.latlon.xplan.validator.ValidatorException; -import de.latlon.xplan.validator.web.shared.InvalidParameterException; -import de.latlon.xplan.validator.web.shared.ValidationException; +import de.latlon.xplanbox.core.gwt.commons.shared.InvalidParameterException; import de.latlon.xplan.validator.web.shared.ValidationSettings; -import de.latlon.xplan.validator.web.shared.ValidationSummary; /** * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a> diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/ValidationServiceAsync.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/ValidationServiceAsync.java similarity index 86% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/ValidationServiceAsync.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/ValidationServiceAsync.java index ca5acc0fabbadd59694597fad3dc345893838dc2..9a14440b2c0994ee05105a9c562882ac6a219d5d 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/client/service/ValidationServiceAsync.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/client/service/ValidationServiceAsync.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,12 +18,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.client.service; +package de.latlon.xplanbox.core.gwt.commons.client.service; import com.google.gwt.user.client.rpc.AsyncCallback; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationSummary; import de.latlon.xplan.validator.web.shared.ValidationSettings; -import de.latlon.xplan.validator.web.shared.ValidationSummary; /** * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a> diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/server/service/DefaultValidationConfigService.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/server/service/DefaultValidationConfigService.java similarity index 89% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/server/service/DefaultValidationConfigService.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/server/service/DefaultValidationConfigService.java index af00456ccd98ac6c68150644413cf649a65e386b..be4edf215a0595fc6c372785f7a55ec0a9418848 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/server/service/DefaultValidationConfigService.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/server/service/DefaultValidationConfigService.java @@ -18,15 +18,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.server.service; +package de.latlon.xplanbox.core.gwt.commons.server.service; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationConfig; import de.latlon.xplan.validator.semantic.configuration.metadata.RulesMetadata; import de.latlon.xplan.validator.semantic.profile.SemanticProfiles; -import de.latlon.xplan.validator.web.client.service.ValidationConfigService; -import de.latlon.xplan.validator.web.shared.ValidationConfig; -import de.latlon.xplan.validator.web.shared.ValidationProfile; +import de.latlon.xplanbox.core.gwt.commons.client.service.ValidationConfigService; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationProfile; import org.springframework.beans.factory.annotation.Autowired; import javax.servlet.ServletConfig; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/server/service/ReportController.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/server/service/ReportController.java similarity index 96% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/server/service/ReportController.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/server/service/ReportController.java index 4fdd4a94b5f35070695b3e7d2354f58e31a8834a..e10ffba0e1510ccd1d8f50194179531ee9f85532 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/server/service/ReportController.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/server/service/ReportController.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.server.service; +package de.latlon.xplanbox.core.gwt.commons.server.service; import java.io.IOException; import java.util.List; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/server/service/ReportProvider.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/server/service/ReportProvider.java similarity index 94% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/server/service/ReportProvider.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/server/service/ReportProvider.java index 4c84786283bc34c91d5c2df15bf938447fcd03f2..93d6d28907ae09efde49afb19d04b2263728de6b 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/server/service/ReportProvider.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/server/service/ReportProvider.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.server.service; +package de.latlon.xplanbox.core.gwt.commons.server.service; import java.io.IOException; import java.util.List; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/server/service/ValidationUtils.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/server/service/ValidationUtils.java similarity index 90% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/server/service/ValidationUtils.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/server/service/ValidationUtils.java index 957987f16bec59ee8cc7526ee3c449f6313b13db..2a2e993b572bab34afd2e61e0b0b55b2e10a81b2 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/server/service/ValidationUtils.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/server/service/ValidationUtils.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,9 +18,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.server.service; +package de.latlon.xplanbox.core.gwt.commons.server.service; -import de.latlon.xplan.validator.web.shared.InvalidParameterException; +import de.latlon.xplanbox.core.gwt.commons.shared.InvalidParameterException; import de.latlon.xplan.validator.web.shared.ValidationSettings; import javax.validation.ConstraintViolation; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/InvalidParameterException.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/InvalidParameterException.java similarity index 90% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/InvalidParameterException.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/InvalidParameterException.java index 7971c78d7ba83b1cc14b36fdebfe0d4a1208930b..79dd9207ec0ad828d6fb0da1da1249bee0b80afa 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/InvalidParameterException.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/InvalidParameterException.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.shared; +package de.latlon.xplanbox.core.gwt.commons.shared; /** * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a> diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/MapPreviewException.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/MapPreviewException.java similarity index 90% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/MapPreviewException.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/MapPreviewException.java index 876854210a6828bf639fea530ced27fed12b9e27..5cdec25be3a5a2be7bb30575396951c27a2a41ec 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/MapPreviewException.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/MapPreviewException.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.shared; +package de.latlon.xplanbox.core.gwt.commons.shared; import java.io.Serializable; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationConfig.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/ValidationConfig.java similarity index 97% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationConfig.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/ValidationConfig.java index 09225b7a29b477a62ce43d06c24c62753b670969..dd1438b4f424794502dcc8d69035492ac9f365ed 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationConfig.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/ValidationConfig.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.shared; +package de.latlon.xplanbox.core.gwt.commons.shared; import java.io.Serializable; import java.util.ArrayList; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationException.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/ValidationException.java similarity index 91% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationException.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/ValidationException.java index 3a137161507d7d1a576bb6b612cf93dde2e1ea2f..9f3ef8af509d70b97435bd4dcfb0555ff5496d86 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationException.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/ValidationException.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.shared; +package de.latlon.xplanbox.core.gwt.commons.shared; /** * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz</a> diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationProfile.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/ValidationProfile.java similarity index 97% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationProfile.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/ValidationProfile.java index ced3a0d2a5b61ec51a94ff33e9e9b5b8a4398805..48dd3a291832e8e4728a5fd34d94f30b186ee33d 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationProfile.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/ValidationProfile.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.shared; +package de.latlon.xplanbox.core.gwt.commons.shared; import java.io.Serializable; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationSummary.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/ValidationSummary.java similarity index 94% rename from xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationSummary.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/ValidationSummary.java index a4c7efe97b4c6b8b352be0fa518ea868ca06f6b0..5f0b81413b31f57c317d82d663e95ae25240def4 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationSummary.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/shared/ValidationSummary.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.validator.web.shared; +package de.latlon.xplanbox.core.gwt.commons.shared; import java.io.Serializable; diff --git a/xplan-webapps/xplan-commons-web/src/main/java/de/latlon/xplan/commons/web/CloseableDialogBox.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/web/CloseableDialogBox.java similarity index 95% rename from xplan-webapps/xplan-commons-web/src/main/java/de/latlon/xplan/commons/web/CloseableDialogBox.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/web/CloseableDialogBox.java index 209b6db552920a3f222c218bbb8c66c2a17979fd..96aa64164b2e4d98573cd428a8320882c08d304f 100644 --- a/xplan-webapps/xplan-commons-web/src/main/java/de/latlon/xplan/commons/web/CloseableDialogBox.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/web/CloseableDialogBox.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-commons-web - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.commons.web; +package de.latlon.xplanbox.core.gwt.commons.web; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; @@ -29,7 +29,7 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.VerticalPanel; -import de.latlon.xplan.commons.web.i18n.XPlanMessages; +import de.latlon.xplanbox.core.gwt.commons.web.i18n.XPlanMessages; /** * Extends the {@link DialogBox} with a button to close the dialog diff --git a/xplan-webapps/xplan-commons-web/src/main/java/de/latlon/xplan/commons/web/DisengageableButtonCell.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/web/DisengageableButtonCell.java similarity index 94% rename from xplan-webapps/xplan-commons-web/src/main/java/de/latlon/xplan/commons/web/DisengageableButtonCell.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/web/DisengageableButtonCell.java index 8da2d6f8e3bec055dbc3900dce95b41bb82bfa6a..76dd395861f8232acd42616b36f1f9df424144ce 100644 --- a/xplan-webapps/xplan-commons-web/src/main/java/de/latlon/xplan/commons/web/DisengageableButtonCell.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/web/DisengageableButtonCell.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-commons-web - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.commons.web; +package de.latlon.xplanbox.core.gwt.commons.web; import com.google.gwt.cell.client.ButtonCell; import com.google.gwt.safehtml.shared.SafeHtml; diff --git a/xplan-webapps/xplan-commons-web/src/main/java/de/latlon/xplan/commons/web/i18n/XPlanMessages.java b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/web/i18n/XPlanMessages.java similarity index 90% rename from xplan-webapps/xplan-commons-web/src/main/java/de/latlon/xplan/commons/web/i18n/XPlanMessages.java rename to xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/web/i18n/XPlanMessages.java index d8affaefd59ce46b2ef66711b33f57208223c816..c05cda654d6ddc15619a80d84872f5aa9e35bdad 100644 --- a/xplan-webapps/xplan-commons-web/src/main/java/de/latlon/xplan/commons/web/i18n/XPlanMessages.java +++ b/xplan-core/xplan-core-gwt/src/main/java/de/latlon/xplanbox/core/gwt/commons/web/i18n/XPlanMessages.java @@ -1,6 +1,6 @@ /*- * #%L - * xplan-commons-web - Modul zur Gruppierung aller Webapps + * xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten * %% * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH * %% @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package de.latlon.xplan.commons.web.i18n; +package de.latlon.xplanbox.core.gwt.commons.web.i18n; import com.google.gwt.i18n.client.Messages; diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/resources/de/latlon/xplan/validator/web/XPlanValidatorWebCommons.gwt.xml b/xplan-core/xplan-core-gwt/src/main/resources/de/latlon/xplanbox/core/gwt/commons/XPlanCommons.gwt.xml similarity index 79% rename from xplan-webapps/xplan-validator-web-commons/src/main/resources/de/latlon/xplan/validator/web/XPlanValidatorWebCommons.gwt.xml rename to xplan-core/xplan-core-gwt/src/main/resources/de/latlon/xplanbox/core/gwt/commons/XPlanCommons.gwt.xml index 88d563e6bc707d8959cc53a302b5809baf5771ca..268f66aae23f9a161fbcac38292703566046f526 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/resources/de/latlon/xplan/validator/web/XPlanValidatorWebCommons.gwt.xml +++ b/xplan-core/xplan-core-gwt/src/main/resources/de/latlon/xplanbox/core/gwt/commons/XPlanCommons.gwt.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - xplan-validator-web-commons - Modul zur Gruppierung aller Webapps + xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten %% Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH %% @@ -21,11 +21,10 @@ --> <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN" - "http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd"> -<module rename-to='XPlanValidatorWebCommons'> - - <inherits name='com.google.gwt.user.User'/> + "http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd"> +<module rename-to='XPlanCommons'> + <source path='web'/> <source path='client'/> <source path='server'/> <source path='shared'/> diff --git a/xplan-webapps/xplan-validator-web-commons/src/main/resources/de/latlon/xplan/validator/web/client/ValidatorWebCommonsMessages.properties b/xplan-core/xplan-core-gwt/src/main/resources/de/latlon/xplanbox/core/gwt/commons/client/ValidatorWebCommonsMessages.properties similarity index 97% rename from xplan-webapps/xplan-validator-web-commons/src/main/resources/de/latlon/xplan/validator/web/client/ValidatorWebCommonsMessages.properties rename to xplan-core/xplan-core-gwt/src/main/resources/de/latlon/xplanbox/core/gwt/commons/client/ValidatorWebCommonsMessages.properties index 02a559208950eead8593cb1e119176b45cfce320..88e99a9b23f033f362a648ff5392fe7f20520ca3 100644 --- a/xplan-webapps/xplan-validator-web-commons/src/main/resources/de/latlon/xplan/validator/web/client/ValidatorWebCommonsMessages.properties +++ b/xplan-core/xplan-core-gwt/src/main/resources/de/latlon/xplanbox/core/gwt/commons/client/ValidatorWebCommonsMessages.properties @@ -1,6 +1,6 @@ ### # #%L -# xplan-validator-web-commons - Modul zur Gruppierung aller Webapps +# xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten # %% # Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH # %% diff --git a/xplan-webapps/xplan-commons-web/src/main/resources/de/latlon/xplan/commons/web/i18n/XPlanMessages.properties b/xplan-core/xplan-core-gwt/src/main/resources/de/latlon/xplanbox/core/gwt/commons/web/i18n/XPlanMessages.properties similarity index 93% rename from xplan-webapps/xplan-commons-web/src/main/resources/de/latlon/xplan/commons/web/i18n/XPlanMessages.properties rename to xplan-core/xplan-core-gwt/src/main/resources/de/latlon/xplanbox/core/gwt/commons/web/i18n/XPlanMessages.properties index 79af1230e1c1c4e9a43c2e870d160df4477b5e40..bafdd9acd13348076bef269ae103f98ece2c7a76 100644 --- a/xplan-webapps/xplan-commons-web/src/main/resources/de/latlon/xplan/commons/web/i18n/XPlanMessages.properties +++ b/xplan-core/xplan-core-gwt/src/main/resources/de/latlon/xplanbox/core/gwt/commons/web/i18n/XPlanMessages.properties @@ -1,6 +1,6 @@ ### # #%L -# xplan-commons-web - Modul zur Gruppierung aller Webapps +# xplan-core-gwt - Modul zur Gruppierung von GWT Komponenten # %% # Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH # %% diff --git a/xplan-core/xplan-inspireplu-transformation/pom.xml b/xplan-core/xplan-core-inspireplu/pom.xml similarity index 91% rename from xplan-core/xplan-inspireplu-transformation/pom.xml rename to xplan-core/xplan-core-inspireplu/pom.xml index 75b96d368cecb23f6d4bc26c2844bcb26a9b0788..a44d65bb352225fd33d4b59a52e5af915efb9c06 100644 --- a/xplan-core/xplan-inspireplu-transformation/pom.xml +++ b/xplan-core/xplan-core-inspireplu/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <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-inspireplu-transformation</artifactId> + <artifactId>xplan-core-inspireplu</artifactId> <packaging>jar</packaging> <description>Transformation XPlanGML nach INSPIRE PLU</description> @@ -14,7 +14,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> diff --git a/xplan-core/xplan-inspireplu-transformation/src/main/java/de/latlon/xplan/inspire/plu/transformation/InspirePluTransformator.java b/xplan-core/xplan-core-inspireplu/src/main/java/de/latlon/xplan/inspire/plu/transformation/InspirePluTransformator.java similarity index 100% rename from xplan-core/xplan-inspireplu-transformation/src/main/java/de/latlon/xplan/inspire/plu/transformation/InspirePluTransformator.java rename to xplan-core/xplan-core-inspireplu/src/main/java/de/latlon/xplan/inspire/plu/transformation/InspirePluTransformator.java diff --git a/xplan-core/xplan-inspireplu-transformation/src/main/java/de/latlon/xplan/inspire/plu/transformation/hale/HaleCliInspirePluTransformator.java b/xplan-core/xplan-core-inspireplu/src/main/java/de/latlon/xplan/inspire/plu/transformation/hale/HaleCliInspirePluTransformator.java similarity index 100% rename from xplan-core/xplan-inspireplu-transformation/src/main/java/de/latlon/xplan/inspire/plu/transformation/hale/HaleCliInspirePluTransformator.java rename to xplan-core/xplan-core-inspireplu/src/main/java/de/latlon/xplan/inspire/plu/transformation/hale/HaleCliInspirePluTransformator.java diff --git a/xplan-core/xplan-inspireplu-transformation/src/test/java/de/latlon/xplan/inspire/plu/transformation/HaleCliInspirePluTransformatorTest.java b/xplan-core/xplan-core-inspireplu/src/test/java/de/latlon/xplan/inspire/plu/transformation/HaleCliInspirePluTransformatorTest.java similarity index 100% rename from xplan-core/xplan-inspireplu-transformation/src/test/java/de/latlon/xplan/inspire/plu/transformation/HaleCliInspirePluTransformatorTest.java rename to xplan-core/xplan-core-inspireplu/src/test/java/de/latlon/xplan/inspire/plu/transformation/HaleCliInspirePluTransformatorTest.java diff --git a/xplan-core/xplan-core-job/pom.xml b/xplan-core/xplan-core-job/pom.xml index 07c8b4884e7b6412c7b8dbeb7911a9873893186a..8193f567980702fcdbe53a1fdcc48ec2c2a38586 100644 --- a/xplan-core/xplan-core-job/pom.xml +++ b/xplan-core/xplan-core-job/pom.xml @@ -12,7 +12,7 @@ <dependencies> <dependency> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> </dependency> <dependency> <groupId>de.latlon</groupId> diff --git a/xplan-core/xplan-core-manager-db/pom.xml b/xplan-core/xplan-core-manager-db/pom.xml index d5d357a9dbcc6e5b7a5afa13235e97bf003b3000..9c5b99b7061fb0480df5d938c15a8d437a95b2a6 100644 --- a/xplan-core/xplan-core-manager-db/pom.xml +++ b/xplan-core/xplan-core-manager-db/pom.xml @@ -13,7 +13,7 @@ <!-- xPlanBox --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> </dependency> <dependency> <groupId>de.latlon</groupId> diff --git a/xplan-core/xplan-core-manager/LICENSE_UNKNOWN.txt b/xplan-core/xplan-core-manager/LICENSE_UNKNOWN.txt new file mode 100644 index 0000000000000000000000000000000000000000..ecd3545da2e65366f7b29605bd294136c20f651d --- /dev/null +++ b/xplan-core/xplan-core-manager/LICENSE_UNKNOWN.txt @@ -0,0 +1,70 @@ +Hinweis: +======== + +Die Testdaten im Verzeichnis src/test/resources werden zu Testzwecken verwendet. +Zu diesen Dateien können keine genaueren Angaben zur Quelle und zu etwaigen Nutzungsrechten angegeben werden. Eine Weitergabe an +Dritte ausser zu Testzwecken der Anwendung xPlanBox ist nicht gestattet. + +Inhalt des Verzeichnisses src/test/resources: +--------------------------------------------- +├── de +│  └── latlon +│  └── xplan +│  └── manager +│  ├── edit +│  │  ├── xplan41 +│  │  │  ├── Eidelstedt_4_V4-Blankenese.gml +│  │  │  ├── V4_1_ID_103.gml +│  │  │  ├── V4_1_ID_103_references.gml +│  │  │  └── V4_1_ID_103_texts.gml +│  │  ├── xplan50 +│  │  │  ├── BP2070.gml +│  │  │  └── V4_1_ID_103.gml +│  │  ├── xplan51 +│  │  │  ├── BP2070.gml +│  │  │  ├── V4_1_ID_103.gml +│  │  │  └── V4_1_ID_103_refScan.gml +│  │  ├── xplan53 +│  │  │  └── BPlan_ohneBereich.gml +│  │  └── xplan54 +│  │  └── BPlan002_5-4.gml +│  ├── metadata +│  │  └── iso-service-metadata-example-template.xml +│  └── wmsconfig +│  └── raster +│  └── evaluation +│  ├── dem30_geotiff_tiled_epsg4326.tiff +│  ├── dem30_geotiff_tiled.tiff +│  ├── dem30.tiff +│  ├── dem30.wld +│  ├── png_25833.png +│  ├── png_25833.png.aux.xml +│  ├── png_nocrs.png +│  └── test.txt +├── log4j2-test.yaml +├── s3Mock.properties +└── testdata + ├── xplan40 + │  └── BPlan004_4-0.zip + ├── xplan41 + │  ├── BPlan001_4-1_Bereiche.zip + │  ├── BPlan001_4-1.zip + │  └── BPlan004_4-1.zip + ├── xplan50 + │  ├── BPlan002_5-0.zip + │  └── BPlan004_5-0.zip + ├── xplan51 + │  ├── BPlan004_5-1.zip + │  ├── FPlan.zip + │  ├── RROP_Landkreis_Test_51.zip + │  └── StErhVO_Heidberg_51.zip + ├── xplan52 + │  ├── BPlan001_5-2_Bereiche.zip + │  └── BPlan004_5-2.zip + └── xplan60 + ├── Blankenese29_Test_60.zip + ├── BPlan001_6-0.zip + ├── BPlan004_6-0.zip + ├── FNP_Test_60.zip + ├── LP-Test_60.zip + └── StErhVO_Hamm_60.zip \ No newline at end of file diff --git a/xplan-core/xplan-manager-core/pom.xml b/xplan-core/xplan-core-manager/pom.xml similarity index 91% rename from xplan-core/xplan-manager-core/pom.xml rename to xplan-core/xplan-core-manager/pom.xml index 371218159ecddd3b1d4218ddac89284bc73efbcd..7d894e863fe93dcbcbafba1be0ec68b4f3ed1d1a 100644 --- a/xplan-core/xplan-manager-core/pom.xml +++ b/xplan-core/xplan-core-manager/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <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-manager-core</artifactId> + <artifactId>xplan-core-manager</artifactId> <packaging>jar</packaging> <description>XPlan Manager Core Komponente</description> @@ -52,23 +52,23 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-validator-core</artifactId> + <artifactId>xplan-core-validator</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-schemas</artifactId> + <artifactId>xplan-core-schemas</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-inspireplu-transformation</artifactId> + <artifactId>xplan-core-inspireplu</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-synthesizer</artifactId> + <artifactId>xplan-core-synthesizer</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -158,12 +158,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-tests-resources</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <classifier>xplan-manager-workspace</classifier> <scope>test</scope> <type>zip</type> diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/CategoryMapper.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/CategoryMapper.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/CategoryMapper.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/CategoryMapper.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/CrsUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/CrsUtils.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/CrsUtils.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/CrsUtils.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/XPlanManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/XPlanManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/XPlanManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/XPlanManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/ConfigurationException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/ConfigurationException.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/ConfigurationException.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/ConfigurationException.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/CoupledResourceConfiguration.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/CoupledResourceConfiguration.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/CoupledResourceConfiguration.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/CoupledResourceConfiguration.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/InternalIdRetrieverConfiguration.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/InternalIdRetrieverConfiguration.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/InternalIdRetrieverConfiguration.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/InternalIdRetrieverConfiguration.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfiguration.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfiguration.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfiguration.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfiguration.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfigurationAnalyser.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfigurationAnalyser.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfigurationAnalyser.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfigurationAnalyser.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/AmbiguousBereichNummernException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/AmbiguousBereichNummernException.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/AmbiguousBereichNummernException.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/AmbiguousBereichNummernException.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/DatabaseUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/DatabaseUtils.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/DatabaseUtils.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/DatabaseUtils.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/ManagerWorkspaceWrapper.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/ManagerWorkspaceWrapper.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/ManagerWorkspaceWrapper.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/ManagerWorkspaceWrapper.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/PlanNotFoundException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/PlanNotFoundException.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/PlanNotFoundException.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/PlanNotFoundException.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanInspirePluAdapter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanInspirePluAdapter.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanInspirePluAdapter.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanInspirePluAdapter.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanManagerDao.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanManagerDao.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanManagerDao.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanManagerDao.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanSynWfsAdapter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanSynWfsAdapter.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanSynWfsAdapter.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanSynWfsAdapter.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanVersionAndPlanStatus.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanVersionAndPlanStatus.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanVersionAndPlanStatus.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanVersionAndPlanStatus.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanWfsAdapter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanWfsAdapter.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanWfsAdapter.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanWfsAdapter.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/DocumentStorage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/DocumentStorage.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/DocumentStorage.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/DocumentStorage.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/XPlanDocumentManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/XPlanDocumentManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/XPlanDocumentManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/XPlanDocumentManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/config/DocumentStorageContext.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/config/DocumentStorageContext.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/config/DocumentStorageContext.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/config/DocumentStorageContext.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/s3/S3DocumentStorage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/s3/S3DocumentStorage.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/s3/S3DocumentStorage.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/s3/S3DocumentStorage.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/s3/config/AmazonS3DocumentStorageContext.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/s3/config/AmazonS3DocumentStorageContext.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/s3/config/AmazonS3DocumentStorageContext.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/s3/config/AmazonS3DocumentStorageContext.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/ArtefactType.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/ArtefactType.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/ArtefactType.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/ArtefactType.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditException.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditException.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditException.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditType.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditType.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditType.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditType.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditedArtefact.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditedArtefact.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditedArtefact.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditedArtefact.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditedArtefacts.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditedArtefacts.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditedArtefacts.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditedArtefacts.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/ExternalReferenceUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/ExternalReferenceUtils.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/ExternalReferenceUtils.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/ExternalReferenceUtils.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanManipulator.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/XPlanManipulator.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanManipulator.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/XPlanManipulator.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/export/XPlanExportException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/export/XPlanExportException.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/export/XPlanExportException.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/export/XPlanExportException.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/export/XPlanExporter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/export/XPlanExporter.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/export/XPlanExporter.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/export/XPlanExporter.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublishException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublishException.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublishException.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublishException.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublisher.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublisher.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublisher.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublisher.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/internalid/InternalIdRetriever.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/internalid/InternalIdRetriever.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/internalid/InternalIdRetriever.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/internalid/InternalIdRetriever.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/log/SystemLog.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/log/SystemLog.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/log/SystemLog.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/log/SystemLog.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/DataServiceCouplingException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/DataServiceCouplingException.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/DataServiceCouplingException.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/DataServiceCouplingException.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandler.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandler.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandler.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandler.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriter.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriter.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriter.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/TemplateXmlStreamWriterFilter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/TemplateXmlStreamWriterFilter.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/TemplateXmlStreamWriterFilter.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/TemplateXmlStreamWriterFilter.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/csw/CswClient.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/csw/CswClient.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/csw/CswClient.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/csw/CswClient.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/csw/PlanRecordMetadata.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/csw/PlanRecordMetadata.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/csw/PlanRecordMetadata.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/csw/PlanRecordMetadata.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadata.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadata.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadata.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadata.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilder.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilder.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilder.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilder.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/StorageCleanUpManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/StorageCleanUpManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/StorageCleanUpManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/StorageCleanUpManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/StorageEvent.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/StorageEvent.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/StorageEvent.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/StorageEvent.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/listener/FilesystemTransactionListener.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/filesystem/listener/FilesystemTransactionListener.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/listener/FilesystemTransactionListener.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/filesystem/listener/FilesystemTransactionListener.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3Metadata.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3Metadata.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3Metadata.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3Metadata.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3Object.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3Object.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3Object.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3Object.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3Storage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3Storage.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3Storage.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3Storage.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3Context.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3Context.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3Context.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3Context.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/listener/S3TransactionListener.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/listener/S3TransactionListener.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/listener/S3TransactionListener.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/listener/S3TransactionListener.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/AttachmentUrlHandler.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/AttachmentUrlHandler.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/AttachmentUrlHandler.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/AttachmentUrlHandler.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/PlanImportData.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/PlanImportData.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/PlanImportData.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/PlanImportData.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/TransactionUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/TransactionUtils.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/TransactionUtils.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/TransactionUtils.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/UnsupportPlanException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/UnsupportPlanException.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/UnsupportPlanException.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/UnsupportPlanException.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanDeleteManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanDeleteManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanDeleteManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanDeleteManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanInsertManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanInsertManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanInsertManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanInsertManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanDeleteService.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanDeleteService.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanDeleteService.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanDeleteService.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanEditService.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanEditService.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanEditService.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanEditService.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanInsertService.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanInsertService.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanInsertService.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanInsertService.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transformation/HaleXplan41ToXplan51Transformer.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transformation/HaleXplan41ToXplan51Transformer.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transformation/HaleXplan41ToXplan51Transformer.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transformation/HaleXplan41ToXplan51Transformer.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transformation/TransformationResult.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transformation/TransformationResult.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transformation/TransformationResult.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transformation/TransformationResult.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transformation/XPlanGmlTransformer.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transformation/XPlanGmlTransformer.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transformation/XPlanGmlTransformer.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transformation/XPlanGmlTransformer.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsThemesConfig.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsThemesConfig.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsThemesConfig.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsThemesConfig.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorter.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorter.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorter.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationType.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationType.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationType.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationType.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterUtils.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterUtils.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterUtils.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapter.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapter.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapter.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/ConfigWriterUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/ConfigWriterUtils.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/ConfigWriterUtils.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/ConfigWriterUtils.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GdalRasterEvaluation.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GdalRasterEvaluation.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GdalRasterEvaluation.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GdalRasterEvaluation.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GeotiffRasterEvaluation.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GeotiffRasterEvaluation.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GeotiffRasterEvaluation.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GeotiffRasterEvaluation.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/RasterEvaluation.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/RasterEvaluation.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/RasterEvaluation.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/RasterEvaluation.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluator.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluator.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluator.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluator.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/RasterStorage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/RasterStorage.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/RasterStorage.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/RasterStorage.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/StorageException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/StorageException.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/StorageException.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/StorageException.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorage.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorage.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorage.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/AmazonS3RasterStorageContext.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/AmazonS3RasterStorageContext.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/AmazonS3RasterStorageContext.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/AmazonS3RasterStorageContext.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapper.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapper.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapper.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapper.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceException.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceException.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceException.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloadAction.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloadAction.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloadAction.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloadAction.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloader.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloader.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloader.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloader.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderConfiguration.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderConfiguration.java similarity index 100% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderConfiguration.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderConfiguration.java diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceUtils.java similarity index 97% rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceUtils.java rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceUtils.java index b8e8f98c7121a368fe14485680fb98f7cae5e0a0..c0742a2e3ec4fbd9ca29253ad4f084a0a3899c2d 100644 --- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceUtils.java +++ b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceUtils.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% @@ -40,7 +40,7 @@ public class WorkspaceUtils { private static final Logger LOG = LoggerFactory.getLogger(WorkspaceUtils.class); - public static final String DEFAULT_XPLANSYN_WMS_WORKSPACE = "xplansyn-wms-workspace"; + public static final String DEFAULT_XPLANSYN_WMS_WORKSPACE = "xplan-services-wms-workspace"; public static final String DEFAULT_XPLAN_MANAGER_WORKSPACE = "xplan-manager-workspace"; @@ -106,8 +106,8 @@ public class WorkspaceUtils { /** * @param workspaceDir directory to use as workspace, may be <code>null</code> * @return the location of the workspace (passed directory or the workspace with - * default name ('xplansyn-wms-workspace') in the deegree workspace root directory) if - * exist, never <code>null</code> + * default name ('xplan-services-wms-workspace') in the deegree workspace root + * directory) if exist, never <code>null</code> * @throws Exception - if a workspace with the given name does not exist */ public static File findWorkspaceDirectory(File workspaceDir) throws Exception { diff --git a/xplan-core/xplan-manager-core/src/main/resources/de/latlon/xplan/manager/configuration/managerConfiguration.properties b/xplan-core/xplan-core-manager/src/main/resources/de/latlon/xplan/manager/configuration/managerConfiguration.properties similarity index 100% rename from xplan-core/xplan-manager-core/src/main/resources/de/latlon/xplan/manager/configuration/managerConfiguration.properties rename to xplan-core/xplan-core-manager/src/main/resources/de/latlon/xplan/manager/configuration/managerConfiguration.properties diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/CategoryMapperTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/CategoryMapperTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/CategoryMapperTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/CategoryMapperTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java similarity index 97% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java index 4bfdcb1055f1adf1592432eee8d8961ed6cba537..b3599dab4ce56f3f0ad581b311bfba8a28c9944e 100644 --- a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java +++ b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java @@ -20,11 +20,9 @@ */ package de.latlon.xplan.manager; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.archive.XPlanArchiveCreator; import de.latlon.xplan.commons.configuration.SortConfiguration; import de.latlon.xplan.manager.configuration.ManagerConfiguration; -import de.latlon.xplan.manager.database.ManagerWorkspaceWrapper; import de.latlon.xplan.manager.database.XPlanDao; import de.latlon.xplan.manager.web.shared.PlanStatus; import de.latlon.xplan.manager.web.shared.RasterEvaluationResult; @@ -165,7 +163,7 @@ public class XPlanManagerTest { } private String copyPlan() throws IOException { - InputStream resource = ResourceAccessor.readResourceStream("xplan41/BPlan001_4-1.zip"); + InputStream resource = getClass().getResourceAsStream("/testdata/xplan41/BPlan001_4-1.zip"); FileOutputStream output = null; try { File resourceFile = File.createTempFile("XPlanManagerTest_", ".zip"); diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/config/CoreTestContext.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/config/CoreTestContext.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/config/CoreTestContext.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/config/CoreTestContext.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/configuration/ManagerConfigurationTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/configuration/ManagerConfigurationTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/configuration/ManagerConfigurationTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/configuration/ManagerConfigurationTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/document/XPlanDocumentManagerTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/document/XPlanDocumentManagerTest.java similarity index 97% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/document/XPlanDocumentManagerTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/document/XPlanDocumentManagerTest.java index fbb2ccd2398c04034270795a6689c6f8b386b83e..cfac4104550e18b1eb109b2eb6616216e83bc5df 100644 --- a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/document/XPlanDocumentManagerTest.java +++ b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/document/XPlanDocumentManagerTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.manager.document; -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; @@ -60,7 +59,7 @@ public class XPlanDocumentManagerTest { ApplicationEventPublisher applicationEventPublisher = mock(ApplicationEventPublisher.class); XPlanDocumentManager xPlanDocumentManager = new XPlanDocumentManager(storage, applicationEventPublisher); - InputStream inputStream = ResourceAccessor.readResourceStream("xplan60/StErhVO_Hamm_60.zip"); + InputStream inputStream = getClass().getResourceAsStream("/testdata/xplan60/StErhVO_Hamm_60.zip"); XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchive archive = archiveCreator.createXPlanArchiveFromZip("StErhVO_Hamm_60.zip", inputStream); FeatureCollection featureCollection = XPlanGmlParserBuilder.newBuilder() diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/document/s3/S3DocumentStorageIT.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/document/s3/S3DocumentStorageIT.java similarity index 96% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/document/s3/S3DocumentStorageIT.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/document/s3/S3DocumentStorageIT.java index baabc7d0f1c38bea67d49ff3911f0e0788d33428..1939d8cc063e279db7aa2e8c5e090fbbfc87a6e8 100644 --- a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/document/s3/S3DocumentStorageIT.java +++ b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/document/s3/S3DocumentStorageIT.java @@ -20,11 +20,10 @@ */ package de.latlon.xplan.manager.document.s3; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.archive.XPlanArchive; import de.latlon.xplan.commons.archive.XPlanArchiveCreator; -import de.latlon.xplan.manager.storage.StorageEvent; import de.latlon.xplan.manager.document.s3.config.AmazonS3DocumentStorageContext; +import de.latlon.xplan.manager.storage.StorageEvent; import de.latlon.xplan.manager.storage.s3.config.AmazonS3TestContext; import de.latlon.xplan.manager.wmsconfig.raster.storage.StorageException; import org.junit.Test; @@ -67,7 +66,7 @@ public class S3DocumentStorageIT { @Test public void testImportDocuments() throws IOException, StorageException { - InputStream inputStream = ResourceAccessor.readResourceStream("xplan60/StErhVO_Hamm_60.zip"); + InputStream inputStream = getClass().getResourceAsStream("/testdata/xplan60/StErhVO_Hamm_60.zip"); XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchive archive = archiveCreator.createXPlanArchiveFromZip("StErhVO_Hamm_60.zip", inputStream); diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/ExternalReferenceUtilsTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/ExternalReferenceUtilsTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/ExternalReferenceUtilsTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/ExternalReferenceUtilsTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/XPlanManipulatorTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/XPlanManipulatorTest.java similarity index 99% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/XPlanManipulatorTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/XPlanManipulatorTest.java index 2c0db76f0dfd370536040b59079e7b63a4b57911..eedfb9c939ffe6d99c25274633a1802030e85611 100644 --- a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/XPlanManipulatorTest.java +++ b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/XPlanManipulatorTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.manager.edit; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.XPlanSchemas; import de.latlon.xplan.commons.XPlanVersion; import de.latlon.xplan.commons.archive.XPlanArchive; @@ -1200,7 +1199,7 @@ public class XPlanManipulatorTest { } private FeatureCollection readXPlanGmlFromZip(String resource) throws Exception { - InputStream resourceAsStream = ResourceAccessor.readResourceStream(resource); + InputStream resourceAsStream = getClass().getResourceAsStream("/testdata/" + resource); XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchive xPlanArchive = archiveCreator.createXPlanArchiveFromZip(resource, resourceAsStream); return XPlanGmlParserBuilder.newBuilder().build().parseFeatureCollection(xPlanArchive); diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/XPlanToEditFactoryTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/XPlanToEditFactoryTest.java similarity index 99% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/XPlanToEditFactoryTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/XPlanToEditFactoryTest.java index 6310298ddbc569fafcc3c4d3b9291a8d50db481f..f5fff245dbe0572fb189eceb67c7804d4411743f 100644 --- a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/XPlanToEditFactoryTest.java +++ b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/XPlanToEditFactoryTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.manager.edit; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.XPlanType; import de.latlon.xplan.commons.XPlanVersion; import de.latlon.xplan.commons.archive.XPlanArchive; @@ -534,7 +533,7 @@ public class XPlanToEditFactoryTest { private FeatureCollection readXPlanArchive(XPlanVersion xplanVersion, String resource) throws IOException, XMLStreamException, UnknownCRSException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - InputStream inputStream = ResourceAccessor.readResourceStream(resource); + InputStream inputStream = getClass().getResourceAsStream("/testdata/" + resource); XPlanArchive xPlanArchiveFromZip = archiveCreator.createXPlanArchiveFromZip(resource, inputStream); InputStream mainFileInputStream = xPlanArchiveFromZip.getMainFileInputStream(); return XPlanGmlParserBuilder.newBuilder().build().parseFeatureCollection(mainFileInputStream, xplanVersion); diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/export/XPlanExporterTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/export/XPlanExporterTest.java similarity index 97% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/export/XPlanExporterTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/export/XPlanExporterTest.java index a1ff24002213c98022e03ac2e1ac77f75acbb6e0..b2f5c5faefd6b5a4023a9e50688b3610cb7d10e8 100644 --- a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/export/XPlanExporterTest.java +++ b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/export/XPlanExporterTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.manager.export; -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.XPlanFeatureCollection; @@ -132,7 +131,7 @@ public class XPlanExporterTest { private XPlanArchive createArchive(String testArchiveName) throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - InputStream archiveResource = ResourceAccessor.readResourceStream(testArchiveName); + InputStream archiveResource = getClass().getResourceAsStream("/testdata/" + testArchiveName); return archiveCreator.createXPlanArchiveFromZip(testArchiveName, archiveResource); } diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/internalid/InternalIdRetrieverTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/internalid/InternalIdRetrieverTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/internalid/InternalIdRetrieverTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/internalid/InternalIdRetrieverTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandlerTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandlerTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandlerTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandlerTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriterTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriterTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriterTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriterTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/metadata/csw/CswClientTestManual.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/metadata/csw/CswClientTestManual.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/metadata/csw/CswClientTestManual.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/metadata/csw/CswClientTestManual.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilderTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilderTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilderTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilderTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManagerTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManagerTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManagerTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManagerTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageTestManual.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageTestManual.java similarity index 96% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageTestManual.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageTestManual.java index 76a3eeaa6c5f3ff0b0964fe3a244509edd23dd24..35d3c6517c2eb218925c4f471d60701b2d85d7a3 100644 --- a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageTestManual.java +++ b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageTestManual.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.manager.storage.s3; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.archive.XPlanArchiveContentAccess; import de.latlon.xplan.commons.archive.XPlanArchiveCreator; import de.latlon.xplan.manager.storage.s3.config.AmazonS3TestContext; @@ -61,7 +60,7 @@ public class S3StorageTestManual { @Test public void testInsertObjectAndGetObject() throws IOException, StorageException { - InputStream inputStream = ResourceAccessor.readResourceStream("xplan60/Blankenese29_Test_60.zip"); + InputStream inputStream = getClass().getResourceAsStream("/testdata/xplan60/Blankenese29_Test_60.zip"); XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchiveContentAccess archive = archiveCreator.createXPlanArchiveFromZip("Blankenese29_Test_60.zip", inputStream); diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3TestContext.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3TestContext.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3TestContext.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3TestContext.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/config/S3StorageTestContext.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/config/S3StorageTestContext.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/config/S3StorageTestContext.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/config/S3StorageTestContext.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/transaction/attachment/AttachmentUrlHandlerTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/transaction/attachment/AttachmentUrlHandlerTest.java similarity index 99% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/transaction/attachment/AttachmentUrlHandlerTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/transaction/attachment/AttachmentUrlHandlerTest.java index 207172b7fd27646d623d0431b835e357db249a1c..88663f19e24b2550364c92ae4c27fd29b79418b5 100644 --- a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/transaction/attachment/AttachmentUrlHandlerTest.java +++ b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/transaction/attachment/AttachmentUrlHandlerTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.manager.transaction.attachment; -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.XPlanFeatureCollection; @@ -252,7 +251,7 @@ public class AttachmentUrlHandlerTest { private XPlanFeatureCollection getXPlanFeatureCollection(String resource) throws IOException, XMLStreamException, UnknownCRSException { - InputStream inputStream = ResourceAccessor.readResourceStream(resource); + InputStream inputStream = getClass().getResourceAsStream("/testdata/" + resource); XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchive archive = archiveCreator.createXPlanArchiveFromZip(resource, inputStream); XPlanFeatureCollection xPlanFeatureCollection = XPlanGmlParserBuilder.newBuilder() diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/ConfigWriterUtilsTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/ConfigWriterUtilsTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/ConfigWriterUtilsTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/ConfigWriterUtilsTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorterTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorterTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorterTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorterTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapterTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapterTest.java similarity index 94% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapterTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapterTest.java index c733ffd4161d9d24334bce95f9a826b0d784b0be..6b74bb7a5daa35afede661f6a36240f995fba659 100644 --- a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapterTest.java +++ b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapterTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.manager.wmsconfig.raster.access; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.archive.XPlanArchive; import de.latlon.xplan.commons.archive.XPlanArchiveCreator; import org.junit.Ignore; @@ -47,7 +46,7 @@ public class GdalRasterAdapterTest { assumeTrue(isGdalSuccessfullInitialized()); XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - InputStream testPlan = ResourceAccessor.readResourceStream("xplan60/Blankenese29_Test_60.zip"); + InputStream testPlan = getClass().getResourceAsStream("/testdata/xplan60/Blankenese29_Test_60.zip"); XPlanArchive xPlanArchive = archiveCreator.createXPlanArchiveFromZip("Blankenese29_Test_60.zip", testPlan); GdalRasterAdapter gdalRasterAdapter = new GdalRasterAdapter(); @@ -74,7 +73,7 @@ public class GdalRasterAdapterTest { assumeTrue(isGdalSuccessfullInitialized()); XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - InputStream testPlan = ResourceAccessor.readResourceStream("xplan60/Blankenese29_Test_60.zip"); + InputStream testPlan = getClass().getResourceAsStream("/testdata/xplan60/Blankenese29_Test_60.zip"); XPlanArchive xPlanArchive = archiveCreator.createXPlanArchiveFromZip("Blankenese29_Test_60.zip", testPlan); GdalRasterAdapter gdalRasterAdapter = new GdalRasterAdapter(); diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManagerTestManual.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManagerTestManual.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManagerTestManual.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManagerTestManual.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluatorTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluatorTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluatorTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluatorTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTestManual.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTestManual.java similarity index 94% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTestManual.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTestManual.java index a85a17f8ed022a59c4e3ce88eebb92b985b46fcf..22d750f60772e859310f06b6bb0243f068c718aa 100644 --- a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTestManual.java +++ b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTestManual.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.manager.wmsconfig.raster.storage.s3; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.archive.XPlanArchiveContentAccess; import de.latlon.xplan.commons.archive.XPlanArchiveCreator; import de.latlon.xplan.manager.storage.StorageEvent; @@ -70,7 +69,7 @@ public class S3RasterStorageTestManual { @Test public void testAddRasterFile() throws IOException, StorageException { - InputStream inputStream = ResourceAccessor.readResourceStream("xplan60/Blankenese29_Test_60.zip"); + InputStream inputStream = getClass().getResourceAsStream("/testdata/xplan60/Blankenese29_Test_60.zip"); XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchiveContentAccess archive = archiveCreator.createXPlanArchiveFromZip("Blankenese29_Test_60.zip", inputStream); @@ -92,7 +91,7 @@ public class S3RasterStorageTestManual { } private void importRasterFile() throws IOException, StorageException { - InputStream inputStream = ResourceAccessor.readResourceStream("xplan60/Blankenese29_Test_60.zip"); + InputStream inputStream = getClass().getResourceAsStream("/testdata/xplan60/Blankenese29_Test_60.zip"); XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchiveContentAccess archive = archiveCreator.createXPlanArchiveFromZip("Blankenese29_Test_60.zip", inputStream); diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/S3RasterStorageTestContext.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/S3RasterStorageTestContext.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/S3RasterStorageTestContext.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/S3RasterStorageTestContext.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapperTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapperTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapperTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapperTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderTest.java diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceUtilsTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceUtilsTest.java similarity index 100% rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceUtilsTest.java rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceUtilsTest.java diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/Eidelstedt_4_V4-Blankenese.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/Eidelstedt_4_V4-Blankenese.gml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/Eidelstedt_4_V4-Blankenese.gml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/Eidelstedt_4_V4-Blankenese.gml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103.gml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103.gml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103.gml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_references.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_references.gml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_references.gml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_references.gml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_texts.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_texts.gml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_texts.gml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_texts.gml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan50/BP2070.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan50/BP2070.gml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan50/BP2070.gml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan50/BP2070.gml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan50/V4_1_ID_103.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan50/V4_1_ID_103.gml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan50/V4_1_ID_103.gml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan50/V4_1_ID_103.gml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan51/BP2070.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan51/BP2070.gml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan51/BP2070.gml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan51/BP2070.gml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103.gml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103.gml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103.gml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103_refScan.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103_refScan.gml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103_refScan.gml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103_refScan.gml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan53/BPlan_ohneBereich.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan53/BPlan_ohneBereich.gml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan53/BPlan_ohneBereich.gml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan53/BPlan_ohneBereich.gml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/metadata/iso-service-metadata-example-template.xml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/metadata/iso-service-metadata-example-template.xml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/metadata/iso-service-metadata-example-template.xml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/metadata/iso-service-metadata-example-template.xml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.tiff b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.tiff similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.tiff rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.tiff diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.wld b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.wld similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.wld rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.wld diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled.tiff b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled.tiff similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled.tiff rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled.tiff diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled_epsg4326.tiff b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled_epsg4326.tiff similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled_epsg4326.tiff rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled_epsg4326.tiff diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png.aux.xml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png.aux.xml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png.aux.xml rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png.aux.xml diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_nocrs.png b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_nocrs.png similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_nocrs.png rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_nocrs.png diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/test.txt b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/test.txt similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/test.txt rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/test.txt diff --git a/xplan-core/xplan-manager-core/src/test/resources/log4j2-test.yaml b/xplan-core/xplan-core-manager/src/test/resources/log4j2-test.yaml similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/log4j2-test.yaml rename to xplan-core/xplan-core-manager/src/test/resources/log4j2-test.yaml diff --git a/xplan-core/xplan-manager-core/src/test/resources/s3Mock.properties b/xplan-core/xplan-core-manager/src/test/resources/s3Mock.properties similarity index 100% rename from xplan-core/xplan-manager-core/src/test/resources/s3Mock.properties rename to xplan-core/xplan-core-manager/src/test/resources/s3Mock.properties diff --git a/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan40/BPlan004_4-0.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan40/BPlan004_4-0.zip new file mode 100644 index 0000000000000000000000000000000000000000..54503ca4765d0beb2431066f42186cb89c88ddfd Binary files /dev/null and b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan40/BPlan004_4-0.zip differ diff --git a/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan41/BPlan001_4-1.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan41/BPlan001_4-1.zip new file mode 100644 index 0000000000000000000000000000000000000000..c1e48575248a866bd13ca0e57d60f040900e5586 Binary files /dev/null and b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan41/BPlan001_4-1.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BPlan001_4-1_Bereiche.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan41/BPlan001_4-1_Bereiche.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BPlan001_4-1_Bereiche.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan41/BPlan001_4-1_Bereiche.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BPlan004_4-1.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan41/BPlan004_4-1.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BPlan004_4-1.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan41/BPlan004_4-1.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/BPlan002_5-0.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan50/BPlan002_5-0.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/BPlan002_5-0.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan50/BPlan002_5-0.zip diff --git a/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan50/BPlan004_5-0.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan50/BPlan004_5-0.zip new file mode 100644 index 0000000000000000000000000000000000000000..7e060b0a7beb26ddac9d120a6b312f611396d980 Binary files /dev/null and b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan50/BPlan004_5-0.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BPlan004_5-1.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan51/BPlan004_5-1.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BPlan004_5-1.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan51/BPlan004_5-1.zip diff --git a/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan51/FPlan.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan51/FPlan.zip new file mode 100644 index 0000000000000000000000000000000000000000..f7db923394fc1c564e601a8acff485be3f41dbfd Binary files /dev/null and b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan51/FPlan.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/RROP_Landkreis_Test_51.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan51/RROP_Landkreis_Test_51.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/RROP_Landkreis_Test_51.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan51/RROP_Landkreis_Test_51.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/StErhVO_Heidberg_51.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan51/StErhVO_Heidberg_51.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/StErhVO_Heidberg_51.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan51/StErhVO_Heidberg_51.zip diff --git a/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan52/BPlan001_5-2_Bereiche.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan52/BPlan001_5-2_Bereiche.zip new file mode 100644 index 0000000000000000000000000000000000000000..0459626ac08fed711dd93c6791624d31e0126c0e Binary files /dev/null and b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan52/BPlan001_5-2_Bereiche.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/BPlan004_5-2.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan52/BPlan004_5-2.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/BPlan004_5-2.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan52/BPlan004_5-2.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/BPlan001_6-0.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan60/BPlan001_6-0.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/BPlan001_6-0.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan60/BPlan001_6-0.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/BPlan004_6-0.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan60/BPlan004_6-0.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/BPlan004_6-0.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan60/BPlan004_6-0.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/Blankenese29_Test_60.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan60/Blankenese29_Test_60.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/Blankenese29_Test_60.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan60/Blankenese29_Test_60.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/FNP_Test_60.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan60/FNP_Test_60.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/FNP_Test_60.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan60/FNP_Test_60.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/LP-Test_60.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan60/LP-Test_60.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/LP-Test_60.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan60/LP-Test_60.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/StErhVO_Hamm_60.zip b/xplan-core/xplan-core-manager/src/test/resources/testdata/xplan60/StErhVO_Hamm_60.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/StErhVO_Hamm_60.zip rename to xplan-core/xplan-core-manager/src/test/resources/testdata/xplan60/StErhVO_Hamm_60.zip diff --git a/xplan-resources/xplan-schemas/pom.xml b/xplan-core/xplan-core-schemas/pom.xml similarity index 93% rename from xplan-resources/xplan-schemas/pom.xml rename to xplan-core/xplan-core-schemas/pom.xml index d94614596c853b65704700d7726bfc74c4ed0abc..9d3e8066cf835b02cdf40387ca5a557e73d499f8 100644 --- a/xplan-resources/xplan-schemas/pom.xml +++ b/xplan-core/xplan-core-schemas/pom.xml @@ -1,13 +1,13 @@ <?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-schemas</artifactId> + <artifactId>xplan-core-schemas</artifactId> <packaging>jar</packaging> <description>Ressourcen fuer XPlan Schemas</description> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-resources</artifactId> + <artifactId>xplan-core</artifactId> <version>7.2-SNAPSHOT</version> </parent> diff --git a/xplan-resources/xplan-schemas/src/main/assembly/assembly.xml b/xplan-core/xplan-core-schemas/src/main/assembly/assembly.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/assembly/assembly.xml rename to xplan-core/xplan-core-schemas/src/main/assembly/assembly.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Basisschema.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Basisschema.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Basisschema.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Basisschema.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Bauleitplanung.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Bauleitplanung.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Bauleitplanung.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Bauleitplanung.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Bauleitplanung_ADE_FHH.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Bauleitplanung_ADE_FHH.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Bauleitplanung_ADE_FHH.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Bauleitplanung_ADE_FHH.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Landschaftsplanung.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Landschaftsplanung.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Landschaftsplanung.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Landschaftsplanung.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Landschaftsplanung_Kernmodell.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Landschaftsplanung_Kernmodell.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Landschaftsplanung_Kernmodell.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Landschaftsplanung_Kernmodell.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Landschaftsplanung_NRW.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Landschaftsplanung_NRW.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Landschaftsplanung_NRW.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Landschaftsplanung_NRW.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung_Kernmodell.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung_Kernmodell.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung_Kernmodell.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung_Kernmodell.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung_NRW.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung_NRW.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung_NRW.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung_NRW.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung_RLP.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung_RLP.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung_RLP.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_Regionalplanung_RLP.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_SonstigePlanwerke.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_SonstigePlanwerke.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_SonstigePlanwerke.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanGML_SonstigePlanwerke.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanung-Operationen.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanung-Operationen.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanung-Operationen.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/XPlanung-Operationen.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/filter/1.0.0/expr.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/filter/1.0.0/expr.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/filter/1.0.0/expr.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/filter/1.0.0/expr.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/filter/1.0.0/filter.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/filter/1.0.0/filter.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/filter/1.0.0/filter.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/filter/1.0.0/filter.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/filter/1.0.0/filterCapabilities.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/filter/1.0.0/filterCapabilities.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/filter/1.0.0/filterCapabilities.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/filter/1.0.0/filterCapabilities.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/gmlProfile/gmlProfilexplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/gmlProfile/gmlProfilexplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/gmlProfile/gmlProfilexplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/gmlProfile/gmlProfilexplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gco/basicTypes.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gco/basicTypes.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gco/basicTypes.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gco/basicTypes.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gco/gco.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gco/gco.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gco/gco.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gco/gco.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gco/gcoBase.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gco/gcoBase.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gco/gcoBase.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gco/gcoBase.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/applicationSchema.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/applicationSchema.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/applicationSchema.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/applicationSchema.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/citation.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/citation.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/citation.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/citation.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/constraints.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/constraints.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/constraints.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/constraints.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/content.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/content.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/content.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/content.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/dataQuality.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/dataQuality.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/dataQuality.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/dataQuality.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/distribution.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/distribution.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/distribution.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/distribution.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/extent.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/extent.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/extent.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/extent.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/freeText.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/freeText.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/freeText.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/freeText.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/gmd.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/gmd.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/gmd.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/gmd.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/identification.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/identification.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/identification.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/identification.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/maintenance.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/maintenance.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/maintenance.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/maintenance.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/metadataApplication.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/metadataApplication.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/metadataApplication.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/metadataApplication.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/metadataEntity.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/metadataEntity.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/metadataEntity.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/metadataEntity.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/metadataExtension.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/metadataExtension.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/metadataExtension.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/metadataExtension.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/portrayalCatalogue.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/portrayalCatalogue.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/portrayalCatalogue.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/portrayalCatalogue.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/referenceSystem.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/referenceSystem.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/referenceSystem.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/referenceSystem.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/spatialRepresentation.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/spatialRepresentation.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/spatialRepresentation.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmd/spatialRepresentation.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/catalogues.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/catalogues.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/catalogues.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/catalogues.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/codelistItem.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/codelistItem.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/codelistItem.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/codelistItem.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/crsItem.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/crsItem.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/crsItem.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/crsItem.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/extendedTypes.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/extendedTypes.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/extendedTypes.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/extendedTypes.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/gmx.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/gmx.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/gmx.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/gmx.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/gmxUsage.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/gmxUsage.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/gmxUsage.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/gmxUsage.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/uomItem.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/uomItem.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/uomItem.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gmx/uomItem.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gsr/gsr.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gsr/gsr.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gsr/gsr.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gsr/gsr.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gsr/spatialReferencing.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gsr/spatialReferencing.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gsr/spatialReferencing.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gsr/spatialReferencing.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gss/geometry.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gss/geometry.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gss/geometry.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gss/geometry.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gss/gss.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gss/gss.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gss/gss.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gss/gss.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gts/gts.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gts/gts.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gts/gts.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gts/gts.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gts/temporalObjects.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gts/temporalObjects.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gts/temporalObjects.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/iso/19139/20070417/gts/temporalObjects.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/ows19115subset.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/ows19115subset.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/ows19115subset.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/ows19115subset.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsAll.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsAll.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsAll.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsAll.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsCommon.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsCommon.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsCommon.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsCommon.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsDataIdentification.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsDataIdentification.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsDataIdentification.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsDataIdentification.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsExceptionReport.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsExceptionReport.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsExceptionReport.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsExceptionReport.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsGetCapabilities.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsGetCapabilities.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsGetCapabilities.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsGetCapabilities.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsOperationsMetadata.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsOperationsMetadata.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsOperationsMetadata.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsOperationsMetadata.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsServiceIdentification.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsServiceIdentification.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsServiceIdentification.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsServiceIdentification.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsServiceProvider.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsServiceProvider.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsServiceProvider.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/ows/1.0.0/owsServiceProvider.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/sc/ShapeChangeAppinfo.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/sc/ShapeChangeAppinfo.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/sc/ShapeChangeAppinfo.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/sc/ShapeChangeAppinfo.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/wfs/1.0.0/WFS-basic.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/wfs/1.0.0/WFS-basic.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/wfs/1.0.0/WFS-basic.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/wfs/1.0.0/WFS-basic.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/wfs/1.0.0/WFS-capabilities.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/wfs/1.0.0/WFS-capabilities.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/wfs/1.0.0/WFS-capabilities.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/wfs/1.0.0/WFS-capabilities.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/wfs/1.0.0/WFS-transaction.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/wfs/1.0.0/WFS-transaction.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/wfs/1.0.0/WFS-transaction.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/wfs/1.0.0/WFS-transaction.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/xlink/1.0.0/xlinks.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/xlink/1.0.0/xlinks.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_0/xlink/1.0.0/xlinks.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_0/xlink/1.0.0/xlinks.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_AbweichendeBauweise.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_AbweichendeBauweise.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_AbweichendeBauweise.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_AbweichendeBauweise.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailAbgrenzungenTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailAbgrenzungenTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailAbgrenzungenTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailAbgrenzungenTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailArtDerBaulNutzung.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailArtDerBaulNutzung.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailArtDerBaulNutzung.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailArtDerBaulNutzung.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailDachform.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailDachform.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailDachform.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailDachform.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGemeinbedarf.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGemeinbedarf.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGemeinbedarf.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGemeinbedarf.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGemeinschaftsanlagen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGemeinschaftsanlagen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGemeinschaftsanlagen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGemeinschaftsanlagen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGewaesser.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGewaesser.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGewaesser.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGewaesser.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGruenFlaeche.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGruenFlaeche.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGruenFlaeche.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestGruenFlaeche.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestLandwirtschaft.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestLandwirtschaft.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestLandwirtschaft.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestLandwirtschaft.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestNaturschutzgebiet.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestNaturschutzgebiet.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestNaturschutzgebiet.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestNaturschutzgebiet.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestNebenanlagen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestNebenanlagen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestNebenanlagen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestNebenanlagen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestSpielSportanlage.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestSpielSportanlage.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestSpielSportanlage.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestSpielSportanlage.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestStrassenverkehr.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestStrassenverkehr.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestStrassenverkehr.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestStrassenverkehr.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestVerEntsorgung.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestVerEntsorgung.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestVerEntsorgung.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestVerEntsorgung.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestWaldFlaeche.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestWaldFlaeche.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestWaldFlaeche.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestWaldFlaeche.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestWasserwirtschaft.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestWasserwirtschaft.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestWasserwirtschaft.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_DetailZweckbestWasserwirtschaft.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_SonstPlanArt.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_SonstPlanArt.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_SonstPlanArt.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_SonstPlanArt.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_SpezielleBauweiseSonstTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_SpezielleBauweiseSonstTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_SpezielleBauweiseSonstTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_SpezielleBauweiseSonstTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_Status.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_Status.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_Status.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_Status.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_ZweckbestimmungGenerischeObjekte.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_ZweckbestimmungGenerischeObjekte.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_ZweckbestimmungGenerischeObjekte.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_BP_ZweckbestimmungGenerischeObjekte.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailArtDerBaulNutzung.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailArtDerBaulNutzung.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailArtDerBaulNutzung.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailArtDerBaulNutzung.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestGemeinbedarf.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestGemeinbedarf.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestGemeinbedarf.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestGemeinbedarf.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestGewaesser.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestGewaesser.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestGewaesser.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestGewaesser.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestGruen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestGruen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestGruen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestGruen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestLandwirtschaftsFlaeche.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestLandwirtschaftsFlaeche.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestLandwirtschaftsFlaeche.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestLandwirtschaftsFlaeche.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestSpielSportanlage.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestSpielSportanlage.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestSpielSportanlage.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestSpielSportanlage.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestStrassenverkehr.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestStrassenverkehr.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestStrassenverkehr.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestStrassenverkehr.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestVerEntsorgung.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestVerEntsorgung.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestVerEntsorgung.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestVerEntsorgung.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestWaldFlaeche.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestWaldFlaeche.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestWaldFlaeche.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestWaldFlaeche.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestWasserwirtschaft.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestWasserwirtschaft.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestWasserwirtschaft.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_DetailZweckbestWasserwirtschaft.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_SonstPlanArt.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_SonstPlanArt.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_SonstPlanArt.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_SonstPlanArt.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_SpezifischePraegungTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_SpezifischePraegungTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_SpezifischePraegungTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_SpezifischePraegungTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_Status.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_Status.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_Status.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_Status.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_ZentralerVersorgungsbereichAuspraegung.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_ZentralerVersorgungsbereichAuspraegung.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_ZentralerVersorgungsbereichAuspraegung.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_ZentralerVersorgungsbereichAuspraegung.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_ZweckbestimmungGenerischeObjekte.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_ZweckbestimmungGenerischeObjekte.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_ZweckbestimmungGenerischeObjekte.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_FP_ZweckbestimmungGenerischeObjekte.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_BodenschutzrechtDetailTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_BodenschutzrechtDetailTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_BodenschutzrechtDetailTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_BodenschutzrechtDetailTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_DenkmalschutzrechtDetailTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_DenkmalschutzrechtDetailTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_DenkmalschutzrechtDetailTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_DenkmalschutzrechtDetailTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_ErholungFreizeitDetailFunktionen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_ErholungFreizeitDetailFunktionen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_ErholungFreizeitDetailFunktionen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_ErholungFreizeitDetailFunktionen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_InternatSchutzobjektDetailTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_InternatSchutzobjektDetailTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_InternatSchutzobjektDetailTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_InternatSchutzobjektDetailTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_MassanahmeLandschaftsbild.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_MassanahmeLandschaftsbild.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_MassanahmeLandschaftsbild.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_MassanahmeLandschaftsbild.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_MassnahmeLandschaftsbild.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_MassnahmeLandschaftsbild.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_MassnahmeLandschaftsbild.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_MassnahmeLandschaftsbild.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_Pflanzart.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_Pflanzart.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_Pflanzart.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_Pflanzart.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SchutzgebietDetailTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SchutzgebietDetailTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SchutzgebietDetailTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SchutzgebietDetailTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SchutzobjektLandesrechtDetailTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SchutzobjektLandesrechtDetailTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SchutzobjektLandesrechtDetailTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SchutzobjektLandesrechtDetailTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SonstPlanArt.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SonstPlanArt.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SonstPlanArt.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SonstPlanArt.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SonstRechtDetailTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SonstRechtDetailTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SonstRechtDetailTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_SonstRechtDetailTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WaldschutzDetailTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WaldschutzDetailTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WaldschutzDetailTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WaldschutzDetailTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtGemeingebrEinschraenkungNaturschutzDetailTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtGemeingebrEinschraenkungNaturschutzDetailTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtGemeingebrEinschraenkungNaturschutzDetailTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtGemeingebrEinschraenkungNaturschutzDetailTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtSchutzgebietDetailTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtSchutzgebietDetailTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtSchutzgebietDetailTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtSchutzgebietDetailTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtSonstigeTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtSonstigeTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtSonstigeTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtSonstigeTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtWirtschaftAbflussHochwSchutzDetailTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtWirtschaftAbflussHochwSchutzDetailTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtWirtschaftAbflussHochwSchutzDetailTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_LP_WasserrechtWirtschaftAbflussHochwSchutzDetailTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_SonstGrenzeTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_SonstGrenzeTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_SonstGrenzeTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_SonstGrenzeTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_SonstPlanArt.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_SonstPlanArt.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_SonstPlanArt.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_SonstPlanArt.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_Status.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_Status.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_Status.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_Status.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_ZweckbestimmungGenerischeObjekte.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_ZweckbestimmungGenerischeObjekte.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_ZweckbestimmungGenerischeObjekte.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_RP_ZweckbestimmungGenerischeObjekte.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachBodenschutzrecht.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachBodenschutzrecht.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachBodenschutzrecht.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachBodenschutzrecht.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachDenkmalschutzrecht.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachDenkmalschutzrecht.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachDenkmalschutzrecht.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachDenkmalschutzrecht.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachForstrecht.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachForstrecht.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachForstrecht.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachForstrecht.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachLuftverkehrsrecht.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachLuftverkehrsrecht.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachLuftverkehrsrecht.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachLuftverkehrsrecht.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachSchienenverkehrsrecht.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachSchienenverkehrsrecht.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachSchienenverkehrsrecht.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachSchienenverkehrsrecht.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachSonstigemRecht.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachSonstigemRecht.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachSonstigemRecht.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachSonstigemRecht.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachStrassenverkehrsrecht.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachStrassenverkehrsrecht.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachStrassenverkehrsrecht.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachStrassenverkehrsrecht.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachWasserrecht.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachWasserrecht.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachWasserrecht.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizNachWasserrecht.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizSchutzgebietNaturschutzrecht.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizSchutzgebietNaturschutzrecht.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizSchutzgebietNaturschutzrecht.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizSchutzgebietNaturschutzrecht.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizSchutzgebietSonstRecht.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizSchutzgebietSonstRecht.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizSchutzgebietSonstRecht.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizSchutzgebietSonstRecht.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizSchutzgebietWasserrecht.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizSchutzgebietWasserrecht.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizSchutzgebietWasserrecht.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_DetailKlassifizSchutzgebietWasserrecht.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_PlanTyp.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_PlanTyp.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_PlanTyp.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_PlanTyp.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstGebietsArt.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstGebietsArt.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstGebietsArt.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstGebietsArt.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstGrenzeTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstGrenzeTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstGrenzeTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstGrenzeTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstRechtscharakter.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstRechtscharakter.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstRechtscharakter.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstRechtscharakter.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstRechtsstandGebietTyp.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstRechtsstandGebietTyp.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstRechtsstandGebietTyp.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_SO_SonstRechtsstandGebietTyp.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_VegetationsobjektTypen.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_VegetationsobjektTypen.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_VegetationsobjektTypen.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_VegetationsobjektTypen.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_ExterneReferenzArt.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_ExterneReferenzArt.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_ExterneReferenzArt.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_ExterneReferenzArt.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_GesetzlicheGrundlage.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_GesetzlicheGrundlage.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_GesetzlicheGrundlage.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_GesetzlicheGrundlage.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_MimeTypes.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_MimeTypes.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_MimeTypes.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_MimeTypes.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_StylesheetListe.xml b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_StylesheetListe.xml similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_StylesheetListe.xml rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/Codelists/xplan_XP_StylesheetListe.xml diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_BPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_BPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_BPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_BPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_Basisschema.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_Basisschema.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_Basisschema.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_Basisschema.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_FPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_FPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_FPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_FPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_LPlan_Kernmodell.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_LPlan_Kernmodell.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_LPlan_Kernmodell.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_LPlan_Kernmodell.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_RPlan_Kernmodell.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_RPlan_Kernmodell.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_RPlan_Kernmodell.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_RPlan_Kernmodell.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_SonstigePlanwerke.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_SonstigePlanwerke.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_SonstigePlanwerke.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanGML_SonstigePlanwerke.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanung-Operationen.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanung-Operationen.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanung-Operationen.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanung-Operationen.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/gmlProfile/gmlProfilexplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/gmlProfile/gmlProfilexplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/gmlProfile/gmlProfilexplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_4_1/gmlProfile/gmlProfilexplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_BPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_BPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_BPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_BPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_Basisschema.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_Basisschema.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_Basisschema.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_Basisschema.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_FPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_FPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_FPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_FPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_LPlan_Kernmodell.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_LPlan_Kernmodell.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_LPlan_Kernmodell.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_LPlan_Kernmodell.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_Raumordnungsplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_Raumordnungsplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_Raumordnungsplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_Raumordnungsplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_SonstigePlanwerke.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_SonstigePlanwerke.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_SonstigePlanwerke.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanGML_SonstigePlanwerke.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanung-Operationen.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanung-Operationen.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanung-Operationen.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/XPlanung-Operationen.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/gmlProfile/gmlProfilexplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/gmlProfile/gmlProfilexplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/gmlProfile/gmlProfilexplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/gmlProfile/gmlProfilexplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/gmlProfile/xlinks.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/gmlProfile/xlinks.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/gmlProfile/xlinks.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/gmlProfile/xlinks.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/gmlProfile/xml.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/gmlProfile/xml.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_0/gmlProfile/xml.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_0/gmlProfile/xml.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_BPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_BPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_BPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_BPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_Basisschema.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_Basisschema.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_Basisschema.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_Basisschema.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_FPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_FPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_FPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_FPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_LPlan_Kernmodell.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_LPlan_Kernmodell.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_LPlan_Kernmodell.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_LPlan_Kernmodell.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_Raumordnungsplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_Raumordnungsplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_Raumordnungsplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_Raumordnungsplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_SonstigePlanwerke.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_SonstigePlanwerke.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_SonstigePlanwerke.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanGML_SonstigePlanwerke.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanung-Operationen.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanung-Operationen.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanung-Operationen.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/XPlanung-Operationen.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/gmlProfile/gmlProfilexplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/gmlProfile/gmlProfilexplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/gmlProfile/gmlProfilexplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/gmlProfile/gmlProfilexplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/gmlProfile/xlinks.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/gmlProfile/xlinks.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/gmlProfile/xlinks.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/gmlProfile/xlinks.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/gmlProfile/xml.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/gmlProfile/xml.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_1/gmlProfile/xml.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_1/gmlProfile/xml.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_BPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_BPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_BPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_BPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_Basisschema.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_Basisschema.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_Basisschema.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_Basisschema.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_FPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_FPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_FPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_FPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_LPlan_Kernmodell.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_LPlan_Kernmodell.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_LPlan_Kernmodell.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_LPlan_Kernmodell.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_Raumordnungsplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_Raumordnungsplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_Raumordnungsplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_Raumordnungsplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_SonstigePlanwerke.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_SonstigePlanwerke.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_SonstigePlanwerke.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanGML_SonstigePlanwerke.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanung-Operationen.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanung-Operationen.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanung-Operationen.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/XPlanung-Operationen.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/gmlProfile/gmlProfilexplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/gmlProfile/gmlProfilexplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_2/gmlProfile/gmlProfilexplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_2/gmlProfile/gmlProfilexplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_BPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_BPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_BPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_BPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_Basisschema.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_Basisschema.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_Basisschema.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_Basisschema.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_FPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_FPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_FPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_FPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_LPlan_Kernmodell.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_LPlan_Kernmodell.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_LPlan_Kernmodell.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_LPlan_Kernmodell.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_Raumordnungsplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_Raumordnungsplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_Raumordnungsplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_Raumordnungsplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_SonstigePlanwerke.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_SonstigePlanwerke.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_SonstigePlanwerke.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanGML_SonstigePlanwerke.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanung-Operationen.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanung-Operationen.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanung-Operationen.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/XPlanung-Operationen.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/gmlProfile/gmlProfilexplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/gmlProfile/gmlProfilexplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_3/gmlProfile/gmlProfilexplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_3/gmlProfile/gmlProfilexplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_BPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_BPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_BPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_BPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_Basisschema.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_Basisschema.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_Basisschema.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_Basisschema.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_FPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_FPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_FPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_FPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_LPlan_Kernmodell.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_LPlan_Kernmodell.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_LPlan_Kernmodell.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_LPlan_Kernmodell.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_Raumordnungsplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_Raumordnungsplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_Raumordnungsplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_Raumordnungsplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_SonstigePlanwerke.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_SonstigePlanwerke.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_SonstigePlanwerke.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanGML_SonstigePlanwerke.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanung-Operationen.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanung-Operationen.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanung-Operationen.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/XPlanung-Operationen.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/gmlProfile/gmlProfilexplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/gmlProfile/gmlProfilexplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_5_4/gmlProfile/gmlProfilexplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_5_4/gmlProfile/gmlProfilexplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/GmlProfile/gmlProfilexplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/GmlProfile/gmlProfilexplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/GmlProfile/gmlProfilexplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/GmlProfile/gmlProfilexplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_BPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_BPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_BPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_BPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_Basisschema.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_Basisschema.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_Basisschema.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_Basisschema.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_FPlan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_FPlan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_FPlan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_FPlan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_LPlan_Kernmodell.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_LPlan_Kernmodell.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_LPlan_Kernmodell.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_LPlan_Kernmodell.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_Raumordnungsplan.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_Raumordnungsplan.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_Raumordnungsplan.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_Raumordnungsplan.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_SonstigePlanwerke.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_SonstigePlanwerke.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_SonstigePlanwerke.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanGML_SonstigePlanwerke.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanung-Operationen.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanung-Operationen.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanung-Operationen.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_6_0/XPlanung-Operationen.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_Syn/XPlanSyn.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_Syn/XPlanSyn.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_Syn/XPlanSyn.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/XPlanGML_Syn/XPlanSyn.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/xlink/xlink.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/xlink/xlink.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/xlink/xlink.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/xlink/xlink.xsd diff --git a/xplan-resources/xplan-schemas/src/main/resources/appschemas/xlink/xml.xsd b/xplan-core/xplan-core-schemas/src/main/resources/appschemas/xlink/xml.xsd similarity index 100% rename from xplan-resources/xplan-schemas/src/main/resources/appschemas/xlink/xml.xsd rename to xplan-core/xplan-core-schemas/src/main/resources/appschemas/xlink/xml.xsd diff --git a/xplan-security/pom.xml b/xplan-core/xplan-core-security/pom.xml similarity index 93% rename from xplan-security/pom.xml rename to xplan-core/xplan-core-security/pom.xml index fc13b0bb30e22d1e64d04c3a5804ac5fdddda34a..ad4793d381e786e18988f39d7382d856e46c3c9e 100644 --- a/xplan-security/pom.xml +++ b/xplan-core/xplan-core-security/pom.xml @@ -1,11 +1,11 @@ <?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-security</artifactId> + <artifactId>xplan-core-security</artifactId> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplanbox</artifactId> + <artifactId>xplan-core</artifactId> <version>7.2-SNAPSHOT</version> </parent> diff --git a/xplan-security/src/main/java/de/latlon/xplanbox/security/authentication/PropertiesFileUserDetailsManager.java b/xplan-core/xplan-core-security/src/main/java/de/latlon/xplanbox/security/authentication/PropertiesFileUserDetailsManager.java similarity index 100% rename from xplan-security/src/main/java/de/latlon/xplanbox/security/authentication/PropertiesFileUserDetailsManager.java rename to xplan-core/xplan-core-security/src/main/java/de/latlon/xplanbox/security/authentication/PropertiesFileUserDetailsManager.java diff --git a/xplan-security/src/main/java/de/latlon/xplanbox/security/authentication/SecurityConfigurationException.java b/xplan-core/xplan-core-security/src/main/java/de/latlon/xplanbox/security/authentication/SecurityConfigurationException.java similarity index 100% rename from xplan-security/src/main/java/de/latlon/xplanbox/security/authentication/SecurityConfigurationException.java rename to xplan-core/xplan-core-security/src/main/java/de/latlon/xplanbox/security/authentication/SecurityConfigurationException.java diff --git a/xplan-security/src/main/java/de/latlon/xplanbox/security/config/SecurityContext.java b/xplan-core/xplan-core-security/src/main/java/de/latlon/xplanbox/security/config/SecurityContext.java similarity index 100% rename from xplan-security/src/main/java/de/latlon/xplanbox/security/config/SecurityContext.java rename to xplan-core/xplan-core-security/src/main/java/de/latlon/xplanbox/security/config/SecurityContext.java diff --git a/xplan-security/src/test/java/de/latlon/xplanbox/security/config/SecurityContextTest.java b/xplan-core/xplan-core-security/src/test/java/de/latlon/xplanbox/security/config/SecurityContextTest.java similarity index 100% rename from xplan-security/src/test/java/de/latlon/xplanbox/security/config/SecurityContextTest.java rename to xplan-core/xplan-core-security/src/test/java/de/latlon/xplanbox/security/config/SecurityContextTest.java diff --git a/xplan-core/xplan-synthesizer/LICENSE_UNKNOWN.txt b/xplan-core/xplan-core-synthesizer/LICENSE_UNKNOWN.txt similarity index 79% rename from xplan-core/xplan-synthesizer/LICENSE_UNKNOWN.txt rename to xplan-core/xplan-core-synthesizer/LICENSE_UNKNOWN.txt index 67f7b15a30b65a6b6f670da06cbef357e57a88c1..c6e63ad9c3788e697ea3ea2729fe19adf89ff920 100644 --- a/xplan-core/xplan-synthesizer/LICENSE_UNKNOWN.txt +++ b/xplan-core/xplan-core-synthesizer/LICENSE_UNKNOWN.txt @@ -80,5 +80,40 @@ Inhalt des Verzeichnisses src/test/resources: │  └── xplan41_XP_BesondereArtDerBaulNutzung.syn ├── HafenCity7.gml ├── log4j2.yaml -└── Rotherbaum27.gml +├── Rotherbaum27.gml +└── testdata + ├── xplan40 + │  └── BPlan004_4-0.zip + ├── xplan41 + │  ├── BP2070-detailierteArtDerBaulNutzung.zip + │  ├── BP2070.zip + │  ├── BP2135.zip + │  ├── BPlan001_4-1.zip + │  ├── Demo.zip + │  ├── Eidelstedt_4_V4.zip + │  ├── FPlan.zip + │  ├── hc7_bereich_2_V4.zip + │  ├── LA22.zip + │  └── LA67.zip + ├── xplan50 + │  ├── BP2070.zip + │  ├── BP2135.zip + │  ├── LA22.zip + │  └── LA67.zip + ├── xplan51 + │  ├── BP2070.zip + │  ├── BP2135.zip + │  ├── LA22.zip + │  └── LA67.zip + ├── xplan52 + │  ├── BP2070.zip + │  ├── BP2135.zip + │  ├── BPlan001_5-2_Bereiche.zip + │  ├── LA22.zip + │  └── LA67.zip + └── xplan60 + ├── BPlan001_6-0.zip + ├── BPlan002_6-0.zip + ├── FNP_Test_60.zip + └── LP-Test_60.zip diff --git a/xplan-core/xplan-synthesizer/pom.xml b/xplan-core/xplan-core-synthesizer/pom.xml similarity index 89% rename from xplan-core/xplan-synthesizer/pom.xml rename to xplan-core/xplan-core-synthesizer/pom.xml index f04045800873ed803a64c137d281173a825c12ea..a7f725c52f26f1c33620859cb6e3c277e278cfb8 100644 --- a/xplan-core/xplan-synthesizer/pom.xml +++ b/xplan-core/xplan-core-synthesizer/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <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-synthesizer</artifactId> + <artifactId>xplan-core-synthesizer</artifactId> <packaging>jar</packaging> <description>XPlan Manager Synthesizer Komponente</description> @@ -14,7 +14,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> </dependency> <dependency> <groupId>de.latlon</groupId> @@ -50,11 +50,6 @@ <version>2.9.1</version> <scope>test</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>xplan-tests-resources</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanCodelists.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanCodelists.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanCodelists.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanCodelists.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaries.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaries.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaries.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaries.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesParser.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesParser.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesParser.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesParser.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionary.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionary.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionary.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionary.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaryEntry.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaryEntry.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaryEntry.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaryEntry.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactory.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactory.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactory.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactory.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizer.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizer.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizer.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizer.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/PlanContext.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/PlanContext.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/PlanContext.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/PlanContext.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/RuleParser.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/RuleParser.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/RuleParser.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/RuleParser.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizer.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizer.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizer.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizer.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Expression.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Expression.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Expression.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Expression.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/LatestDate.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/LatestDate.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/LatestDate.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/LatestDate.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/StringConstant.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/StringConstant.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/StringConstant.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/StringConstant.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGeometry.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGeometry.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGeometry.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGeometry.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGmlDescription.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGmlDescription.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGmlDescription.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGmlDescription.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanName.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanName.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanName.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanName.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanType.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanType.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanType.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanType.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Xpath.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Xpath.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Xpath.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Xpath.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteile.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteile.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteile.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteile.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlName.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlName.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlName.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlName.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/AbstractXPlanDictionaryLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/AbstractXPlanDictionaryLookup.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/AbstractXPlanDictionaryLookup.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/AbstractXPlanDictionaryLookup.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanEnumerationLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanEnumerationLookup.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanEnumerationLookup.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanEnumerationLookup.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanExternalCodeLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanExternalCodeLookup.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanExternalCodeLookup.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanExternalCodeLookup.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/AbstractFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/AbstractFlattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/AbstractFlattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/AbstractFlattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/DefaultFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/DefaultFlattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/DefaultFlattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/DefaultFlattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/Flattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/Flattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/Flattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/Flattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/XplanFlattenProperty.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/XplanFlattenProperty.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/XplanFlattenProperty.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/XplanFlattenProperty.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/DataTypeFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/DataTypeFlattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/DataTypeFlattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/DataTypeFlattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/FlattenerProperty.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/FlattenerProperty.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/FlattenerProperty.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/FlattenerProperty.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/AbstractTextlicherAbschnittFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/AbstractTextlicherAbschnittFlattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/AbstractTextlicherAbschnittFlattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/AbstractTextlicherAbschnittFlattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpExterneReferenzFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpExterneReferenzFlattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpExterneReferenzFlattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpExterneReferenzFlattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpGenerAttributFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpGenerAttributFlattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpGenerAttributFlattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpGenerAttributFlattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpRasterplanFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpRasterplanFlattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpRasterplanFlattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpRasterplanFlattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpVerfahrensMerkmalFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpVerfahrensMerkmalFlattener.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpVerfahrensMerkmalFlattener.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpVerfahrensMerkmalFlattener.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/Ausrichtung.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/Ausrichtung.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/Ausrichtung.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/Ausrichtung.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/GeometryTypeAbbreviation.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/GeometryTypeAbbreviation.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/GeometryTypeAbbreviation.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/GeometryTypeAbbreviation.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/PraesentationsobjektLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/PraesentationsobjektLookup.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/PraesentationsobjektLookup.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/PraesentationsobjektLookup.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookup.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookup.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookup.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookup.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookup.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookup.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookup.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookup.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookup.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributeProperty.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributeProperty.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributeProperty.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributeProperty.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParser.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParser.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParser.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParser.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyType.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyType.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyType.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyType.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/rules/SynRulesAccessor.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/rules/SynRulesAccessor.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/rules/SynRulesAccessor.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/rules/SynRulesAccessor.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparator.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparator.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparator.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparator.java diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/CastUtils.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/CastUtils.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/CastUtils.java rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/CastUtils.java diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_4_0_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_4_0_Enumerationen.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_4_0_Enumerationen.xml rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_4_0_Enumerationen.xml diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_0_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_0_Enumerationen.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_0_Enumerationen.xml rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_0_Enumerationen.xml diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_1_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_1_Enumerationen.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_1_Enumerationen.xml rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_1_Enumerationen.xml diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_2_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_2_Enumerationen.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_2_Enumerationen.xml rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_2_Enumerationen.xml diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_3_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_3_Enumerationen.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_3_Enumerationen.xml rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_3_Enumerationen.xml diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_4_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_4_Enumerationen.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_4_Enumerationen.xml rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_4_Enumerationen.xml diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_6_0_2_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_6_0_2_Enumerationen.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_6_0_2_Enumerationen.xml rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_6_0_2_Enumerationen.xml diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_Enumerationen_4_1.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_Enumerationen_4_1.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_Enumerationen_4_1.xml rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_Enumerationen_4_1.xml diff --git a/xplan-core/xplan-synthesizer/src/main/resources/featuretypes/renamedFeatureTypes.properties b/xplan-core/xplan-core-synthesizer/src/main/resources/featuretypes/renamedFeatureTypes.properties similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/featuretypes/renamedFeatureTypes.properties rename to xplan-core/xplan-core-synthesizer/src/main/resources/featuretypes/renamedFeatureTypes.properties diff --git a/xplan-core/xplan-synthesizer/src/main/resources/flattener/complexFlattener.yaml b/xplan-core/xplan-core-synthesizer/src/main/resources/flattener/complexFlattener.yaml similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/flattener/complexFlattener.yaml rename to xplan-core/xplan-core-synthesizer/src/main/resources/flattener/complexFlattener.yaml diff --git a/xplan-core/xplan-synthesizer/src/main/resources/junit-platform.properties b/xplan-core/xplan-core-synthesizer/src/main/resources/junit-platform.properties similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/junit-platform.properties rename to xplan-core/xplan-core-synthesizer/src/main/resources/junit-platform.properties diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan40.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan40.syn similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan40.syn rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan40.syn diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan41.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan41.syn similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan41.syn rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan41.syn diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan50.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan50.syn similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan50.syn rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan50.syn diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan51.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan51.syn similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan51.syn rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan51.syn diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan52.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan52.syn similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan52.syn rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan52.syn diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan53.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan53.syn similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan53.syn rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan53.syn diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan54.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan54.syn similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan54.syn rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan54.syn diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan60.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan60.syn similarity index 100% rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan60.syn rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan60.syn diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanCodelistsTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanCodelistsTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanCodelistsTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanCodelistsTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactoryTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactoryTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactoryTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactoryTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/AbstractXplanSynthesizerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/AbstractXplanSynthesizerTest.java similarity index 96% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/AbstractXplanSynthesizerTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/AbstractXplanSynthesizerTest.java index db19a27753c47d7d0e8c3272220cb1c3d982037d..86ba79e34a9d52e069b3a27a5bf7397e70b17950 100644 --- a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/AbstractXplanSynthesizerTest.java +++ b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/AbstractXplanSynthesizerTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.manager.synthesizer; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.XPlanSchemas; import de.latlon.xplan.commons.XPlanVersion; import de.latlon.xplan.commons.archive.XPlanArchive; @@ -107,7 +106,7 @@ public abstract class AbstractXplanSynthesizerTest { protected XPlanArchive getTestArchive(String name) throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); + return archiveCreator.createXPlanArchiveFromZip(name, getClass().getResourceAsStream("/testdata/" + name)); } } diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizerTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizerTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizerTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/RuleParserTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/RuleParserTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/RuleParserTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/RuleParserTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerComparisonTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerComparisonTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerComparisonTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerComparisonTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerConcurrencyTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerConcurrencyTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerConcurrencyTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerConcurrencyTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan40Test.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan40Test.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan40Test.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan40Test.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan41Test.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan41Test.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan41Test.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan41Test.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan50Test.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan50Test.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan50Test.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan50Test.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan51Test.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan51Test.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan51Test.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan51Test.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan52Test.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan52Test.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan52Test.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan52Test.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/LatestDateTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/LatestDateTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/LatestDateTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/LatestDateTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/StringConstantTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/StringConstantTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/StringConstantTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/StringConstantTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/TestFeaturesUtils.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/TestFeaturesUtils.java similarity index 94% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/TestFeaturesUtils.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/TestFeaturesUtils.java index 8c2fe8d5538010ea68dfc28dd106b10bdf39e138..a0afdc94fbad454871eb6df46e8cd06f5b7af590 100644 --- a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/TestFeaturesUtils.java +++ b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/TestFeaturesUtils.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.manager.synthesizer.expression; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.XPlanVersion; import de.latlon.xplan.commons.archive.XPlanArchive; import de.latlon.xplan.commons.archive.XPlanArchiveCreator; @@ -31,8 +30,6 @@ import org.deegree.feature.FeatureCollection; import java.io.InputStream; -import static org.apache.commons.io.IOUtils.closeQuietly; - /** * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a> */ @@ -46,7 +43,7 @@ public class TestFeaturesUtils { public static XPlanFeatureCollection getTestFeatureCollection(String resourceName) throws Exception { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchive archive = archiveCreator.createXPlanArchiveFromZip(resourceName, - ResourceAccessor.readResourceStream(resourceName)); + TestFeaturesUtils.class.getResourceAsStream("/testdata/" + resourceName)); return XPlanGmlParserBuilder.newBuilder().build().parseXPlanFeatureCollection(archive); } diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XpathTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XpathTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XpathTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XpathTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteileTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteileTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteileTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteileTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanFlattenPropertyTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanFlattenPropertyTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanFlattenPropertyTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanFlattenPropertyTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGeometryTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGeometryTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGeometryTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGeometryTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlDescriptionTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlDescriptionTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlDescriptionTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlDescriptionTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlNameTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlNameTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlNameTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlNameTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XplanEnumerationLookupTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XplanEnumerationLookupTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XplanEnumerationLookupTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XplanEnumerationLookupTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattenerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattenerTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattenerTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattenerTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattenerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattenerTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattenerTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattenerTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattenerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattenerTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattenerTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattenerTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattenerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattenerTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattenerTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattenerTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AbstractPraesentationsobjektLookupTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AbstractPraesentationsobjektLookupTest.java similarity index 84% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AbstractPraesentationsobjektLookupTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AbstractPraesentationsobjektLookupTest.java index d5def53cc6de7fa9d1dfcc9e3f164d0935f4b047..f3bba7bc3cdeedf821fcb3402473916c4481db20 100644 --- a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AbstractPraesentationsobjektLookupTest.java +++ b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AbstractPraesentationsobjektLookupTest.java @@ -20,9 +20,6 @@ */ package de.latlon.xplan.manager.synthesizer.expression.praesentation; -import de.latlon.xplan.ResourceAccessor; -import de.latlon.xplan.commons.archive.XPlanArchive; -import de.latlon.xplan.commons.archive.XPlanArchiveCreator; import de.latlon.xplan.manager.synthesizer.PlanContext; import org.deegree.commons.tom.TypedObjectNode; import org.deegree.commons.tom.primitive.PrimitiveValue; @@ -31,8 +28,6 @@ import org.deegree.feature.FeatureCollection; import org.deegree.feature.property.GenericProperty; import org.deegree.feature.property.SimpleProperty; -import java.io.IOException; - import static de.latlon.xplan.commons.XPlanType.BP_Plan; import static de.latlon.xplan.manager.synthesizer.expression.TestFeaturesUtils.getTestFeature; @@ -58,9 +53,4 @@ public abstract class AbstractPraesentationsobjektLookupTest { return (PrimitiveValue) evaluate; } - protected XPlanArchive getTestArchive(String name) throws IOException { - XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); - } - } diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AusrichtungTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AusrichtungTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AusrichtungTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AusrichtungTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookupTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookupTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookupTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookupTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookupTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookupTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookupTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookupTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookupTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookupTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookupTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookupTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParserTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParserTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParserTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParserTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparatorTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparatorTest.java similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparatorTest.java rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparatorTest.java diff --git a/xplan-core/xplan-synthesizer/src/test/resources/HafenCity7.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/HafenCity7.gml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/HafenCity7.gml rename to xplan-core/xplan-core-synthesizer/src/test/resources/HafenCity7.gml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/Rotherbaum27.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/Rotherbaum27.gml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/Rotherbaum27.gml rename to xplan-core/xplan-core-synthesizer/src/test/resources/Rotherbaum27.gml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/dictionary/exampleCodelist.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/dictionary/exampleCodelist.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/dictionary/exampleCodelist.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/dictionary/exampleCodelist.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/BP_DetailArtDerBaulNutzung.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/BP_DetailArtDerBaulNutzung.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/BP_DetailArtDerBaulNutzung.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/BP_DetailArtDerBaulNutzung.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan4.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan4.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan4.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan4.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan5.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan5.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan5.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan5.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/FeatureWithCurve.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/FeatureWithCurve.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/FeatureWithCurve.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/FeatureWithCurve.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/MultipleDates.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/MultipleDates.gml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/MultipleDates.gml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/MultipleDates.gml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/Praesentationsobjekte.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/Praesentationsobjekte.gml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/Praesentationsobjekte.gml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/Praesentationsobjekte.gml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BP_KomplexeZweckbestGruen.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BP_KomplexeZweckbestGruen.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BP_KomplexeZweckbestGruen.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BP_KomplexeZweckbestGruen.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BpDachgestaltung.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BpDachgestaltung.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BpDachgestaltung.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BpDachgestaltung.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpSPEMassnahmenDaten.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpSPEMassnahmenDaten.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpSPEMassnahmenDaten.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpSPEMassnahmenDaten.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittFlattener.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittFlattener.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittFlattener.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittFlattener.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittWithRefText.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittWithRefText.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittWithRefText.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittWithRefText.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpVerbundenerPlanFlattener.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpVerbundenerPlanFlattener.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpVerbundenerPlanFlattener.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpVerbundenerPlanFlattener.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan40.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan40.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan40.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan40.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan41.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan41.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan41.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan41.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan50.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan50.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan50.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan50.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan53.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan53.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan53.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan53.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan60.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan60.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan60.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan60.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2070.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2070.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2070.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2070.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2135.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2135.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2135.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2135.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA22.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA22.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA22.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA22.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA67.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA67.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA67.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA67.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2070.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2070.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2070.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2070.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2135.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2135.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2135.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2135.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA22.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA22.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA22.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA22.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA67.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA67.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA67.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA67.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2070.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2070.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2070.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2070.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2135.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2135.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2135.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2135.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA22.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA22.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA22.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA22.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA67.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA67.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA67.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA67.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2070.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2070.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2070.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2070.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2135.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2135.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2135.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2135.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA22.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA22.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA22.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA22.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA67.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA67.xml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA67.xml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA67.xml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4.gml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4.gml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4.gml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4_ohneErstellungsMassstab.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4_ohneErstellungsMassstab.gml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4_ohneErstellungsMassstab.gml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4_ohneErstellungsMassstab.gml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan003_4-1.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan003_4-1.gml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan003_4-1.gml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan003_4-1.gml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/FP_5-2_PPO-Test.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/FP_5-2_PPO-Test.gml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/FP_5-2_PPO-Test.gml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/FP_5-2_PPO-Test.gml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/Test_PPO_index-1.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/Test_PPO_index-1.gml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/Test_PPO_index-1.gml rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/Test_PPO_index-1.gml diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41.syn b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41.syn similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41.syn rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41.syn diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_BP_DetailArtDerBaulNutzung.syn b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_BP_DetailArtDerBaulNutzung.syn similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_BP_DetailArtDerBaulNutzung.syn rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_BP_DetailArtDerBaulNutzung.syn diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_XP_BesondereArtDerBaulNutzung.syn b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_XP_BesondereArtDerBaulNutzung.syn similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_XP_BesondereArtDerBaulNutzung.syn rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_XP_BesondereArtDerBaulNutzung.syn diff --git a/xplan-core/xplan-synthesizer/src/test/resources/log4j2-test.yaml b/xplan-core/xplan-core-synthesizer/src/test/resources/log4j2-test.yaml similarity index 100% rename from xplan-core/xplan-synthesizer/src/test/resources/log4j2-test.yaml rename to xplan-core/xplan-core-synthesizer/src/test/resources/log4j2-test.yaml diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan40/BPlan004_4-0.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan40/BPlan004_4-0.zip new file mode 100644 index 0000000000000000000000000000000000000000..54503ca4765d0beb2431066f42186cb89c88ddfd Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan40/BPlan004_4-0.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BP2070-detailierteArtDerBaulNutzung.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/BP2070-detailierteArtDerBaulNutzung.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BP2070-detailierteArtDerBaulNutzung.zip rename to xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/BP2070-detailierteArtDerBaulNutzung.zip diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/BP2070.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/BP2070.zip new file mode 100644 index 0000000000000000000000000000000000000000..82a65a05895e235b1db4bb7583736e0cc033b977 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/BP2070.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/BP2135.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/BP2135.zip new file mode 100644 index 0000000000000000000000000000000000000000..eb02168db160858d255dfdd508cc40270826ccd4 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/BP2135.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/BPlan001_4-1.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/BPlan001_4-1.zip new file mode 100644 index 0000000000000000000000000000000000000000..c1e48575248a866bd13ca0e57d60f040900e5586 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/BPlan001_4-1.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/Demo.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/Demo.zip new file mode 100644 index 0000000000000000000000000000000000000000..4494ac8a3159b1ece3afd8fb60d746a438f29792 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/Demo.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/Eidelstedt_4_V4.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/Eidelstedt_4_V4.zip new file mode 100644 index 0000000000000000000000000000000000000000..bc694d6127aa42723891642fe2e19759bcb9aed7 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/Eidelstedt_4_V4.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/FPlan.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/FPlan.zip new file mode 100644 index 0000000000000000000000000000000000000000..1595f9276098207c5be2b4fb830555a014a13256 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/FPlan.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/LA22.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/LA22.zip new file mode 100644 index 0000000000000000000000000000000000000000..259b9daff9bf364f880f97229d22e19e02956ed3 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/LA22.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/LA67.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/LA67.zip new file mode 100644 index 0000000000000000000000000000000000000000..0e4f51a322b2af16e85e9e1889203472422ec4c6 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/LA67.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/hc7_bereich_2_V4.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/hc7_bereich_2_V4.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/hc7_bereich_2_V4.zip rename to xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan41/hc7_bereich_2_V4.zip diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan50/BP2070.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan50/BP2070.zip new file mode 100644 index 0000000000000000000000000000000000000000..809dd4c91e1ac21543cf56d19b8b0fabfcd8dae8 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan50/BP2070.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan50/BP2135.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan50/BP2135.zip new file mode 100644 index 0000000000000000000000000000000000000000..937d56c706f31bde8e79b0ba34c0e4d26d64de8c Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan50/BP2135.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan50/LA22.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan50/LA22.zip new file mode 100644 index 0000000000000000000000000000000000000000..e71bbc375bbd6e0931114255764070648a8d7a13 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan50/LA22.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan50/LA67.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan50/LA67.zip new file mode 100644 index 0000000000000000000000000000000000000000..a7b9cb4d3725d052a7507245a5d99cdd0f562fa4 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan50/LA67.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan51/BP2070.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan51/BP2070.zip new file mode 100644 index 0000000000000000000000000000000000000000..58ae8eaf46d2db3e31d4bb3c073952dd01b33760 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan51/BP2070.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan51/BP2135.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan51/BP2135.zip new file mode 100644 index 0000000000000000000000000000000000000000..d42e7282bda57af39ccf00abf7e6e534c358dd16 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan51/BP2135.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan51/LA22.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan51/LA22.zip new file mode 100644 index 0000000000000000000000000000000000000000..9b90125186d08303121c750b069c7b9e64d22cea Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan51/LA22.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan51/LA67.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan51/LA67.zip new file mode 100644 index 0000000000000000000000000000000000000000..311371ba632f4b47b5db84967936d51a7fddd262 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan51/LA67.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/BP2070.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan52/BP2070.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/BP2070.zip rename to xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan52/BP2070.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/BP2135.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan52/BP2135.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/BP2135.zip rename to xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan52/BP2135.zip diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan52/BPlan001_5-2_Bereiche.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan52/BPlan001_5-2_Bereiche.zip new file mode 100644 index 0000000000000000000000000000000000000000..0459626ac08fed711dd93c6791624d31e0126c0e Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan52/BPlan001_5-2_Bereiche.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/LA22.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan52/LA22.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/LA22.zip rename to xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan52/LA22.zip diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/LA67.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan52/LA67.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/LA67.zip rename to xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan52/LA67.zip diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan60/BPlan001_6-0.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan60/BPlan001_6-0.zip new file mode 100644 index 0000000000000000000000000000000000000000..384cb16f5781e687914b9d7019cb5195fcea65ff Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan60/BPlan001_6-0.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/BPlan002_6-0.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan60/BPlan002_6-0.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/BPlan002_6-0.zip rename to xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan60/BPlan002_6-0.zip diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan60/FNP_Test_60.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan60/FNP_Test_60.zip new file mode 100644 index 0000000000000000000000000000000000000000..ee878f39fe1bc8ed69874258bae64ac1028cf5e6 Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan60/FNP_Test_60.zip differ diff --git a/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan60/LP-Test_60.zip b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan60/LP-Test_60.zip new file mode 100644 index 0000000000000000000000000000000000000000..0094a21bdd5b6478546896340fd5c7d25df68fac Binary files /dev/null and b/xplan-core/xplan-core-synthesizer/src/test/resources/testdata/xplan60/LP-Test_60.zip differ diff --git a/xplan-core/xplan-validator-core/LICENSE_UNKNOWN.txt b/xplan-core/xplan-core-validator/LICENSE_UNKNOWN.txt similarity index 90% rename from xplan-core/xplan-validator-core/LICENSE_UNKNOWN.txt rename to xplan-core/xplan-core-validator/LICENSE_UNKNOWN.txt index e0f87fb418ecaba2820830f97c01b0d77ebde6d4..e5a9f185f722b821876e12e1bf51a9f91cd15bef 100644 --- a/xplan-core/xplan-validator-core/LICENSE_UNKNOWN.txt +++ b/xplan-core/xplan-core-validator/LICENSE_UNKNOWN.txt @@ -149,4 +149,40 @@ Inhalt des Verzeichnisses src/test/resources: │  ├── BP_Wegerecht-Polygon-flaechenschlussFehlt.xml │  ├── inhaltBPPlan-referenziertSO.xml │  ├── xplan.gml -│  └── XP_PPO-positionPoint-keinFlaechenschluss.xml \ No newline at end of file +│  └── XP_PPO-positionPoint-keinFlaechenschluss.xml +├── log4j2-test.yaml +├── profiles-test1.yml +├── profiles-test2.yaml +└── testdata + ├── xplan40 + │  └── BPlan004_4-0.zip + ├── xplan41 + │  ├── BP2070.zip + │  ├── BP2135.zip + │  ├── BPlan001_4-1.zip + │  ├── Demo.zip + │  ├── Eidelstedt_4_V4-broken-geometry.zip + │  ├── Eidelstedt_4_V4_Syntaxfehler.zip + │  ├── Eidelstedt_4_V4.zip + │  ├── FPlan.zip + │  ├── LA22.zip + │  ├── LA67.zip + │  └── PlanWithComplexCurve.zip + ├── xplan50 + │  ├── BP2070.zip + │  ├── BP2135.zip + │  ├── FPlan.zip + │  ├── LA22.zip + │  └── LA67.zip + ├── xplan51 + │  ├── BP2070.zip + │  ├── BP2135.zip + │  ├── BPlan001_5-1.zip + │  ├── FPlan.zip + │  ├── LA22.zip + │  └── LA67.zip + └── xplan60 + ├── Blankenese29.gml + ├── Blankenese29_Test_60.zip + ├── BPlan001_6-0.zip + └── StErhVO_Hamm_60_httpRef.gml \ No newline at end of file diff --git a/xplan-core/xplan-validator-core/pom.xml b/xplan-core/xplan-core-validator/pom.xml similarity index 96% rename from xplan-core/xplan-validator-core/pom.xml rename to xplan-core/xplan-core-validator/pom.xml index f7e6c0b1484f68ec83c4d32759374de6eb10bab8..e5ab179f84236aea0cd74aa1ed54153765afdb6f 100644 --- a/xplan-core/xplan-validator-core/pom.xml +++ b/xplan-core/xplan-core-validator/pom.xml @@ -1,7 +1,7 @@ <?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-validator-core</artifactId> + <artifactId>xplan-core-validator</artifactId> <packaging>jar</packaging> <description>XPlan Validator Core Komponente</description> @@ -73,11 +73,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-synthesizer</artifactId> + <artifactId>xplan-core-synthesizer</artifactId> </dependency> <dependency> <groupId>jakarta.xml.bind</groupId> @@ -205,11 +205,6 @@ <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>xplan-tests-resources</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/ValidationType.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/ValidationType.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/ValidationType.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/ValidationType.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/ValidatorException.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/ValidatorException.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/ValidatorException.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/ValidatorException.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/XPlanValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/XPlanValidator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/XPlanValidator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/XPlanValidator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfiguration.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfiguration.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfiguration.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfiguration.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParser.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParser.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParser.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParser.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/configuration/ValidatorProfile.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/configuration/ValidatorProfile.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/configuration/ValidatorProfile.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/configuration/ValidatorProfile.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidatorImpl.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidatorImpl.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidatorImpl.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidatorImpl.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspector.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspector.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspector.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/GeometricFeatureInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/GeometricFeatureInspector.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/GeometricFeatureInspector.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/GeometricFeatureInspector.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/InvalidGeometryException.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/InvalidGeometryException.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/InvalidGeometryException.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/InvalidGeometryException.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspector.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspector.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspector.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspector.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspector.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspector.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/ControlPoint.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/ControlPoint.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/ControlPoint.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/ControlPoint.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussContext.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussContext.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussContext.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussContext.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussFeatureInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussFeatureInspector.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussFeatureInspector.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussFeatureInspector.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussTolerance.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussTolerance.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussTolerance.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussTolerance.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichFeatureAnalyser.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichFeatureAnalyser.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichFeatureAnalyser.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichFeatureAnalyser.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspector.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspector.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspector.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorContext.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorContext.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorContext.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorContext.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/AbstractGeltungsbereichFeature.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/AbstractGeltungsbereichFeature.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/AbstractGeltungsbereichFeature.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/AbstractGeltungsbereichFeature.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/BereichFeature.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/BereichFeature.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/BereichFeature.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/BereichFeature.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeatureUnderTest.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeatureUnderTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeatureUnderTest.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeatureUnderTest.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeaturesUnderTest.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeaturesUnderTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeaturesUnderTest.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeaturesUnderTest.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/GeltungsbereichFeature.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/GeltungsbereichFeature.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/GeltungsbereichFeature.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/GeltungsbereichFeature.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/InspectorContext.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/InspectorContext.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/InspectorContext.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/InspectorContext.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/PlanFeature.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/PlanFeature.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/PlanFeature.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/PlanFeature.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/report/BadGeometry.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/report/BadGeometry.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/report/BadGeometry.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/report/BadGeometry.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/report/GeometricValidatorResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/report/GeometricValidatorResult.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/report/GeometricValidatorResult.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/report/GeometricValidatorResult.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/i18n/ValidationMessages.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/i18n/ValidationMessages.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/i18n/ValidationMessages.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/i18n/ValidationMessages.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportArchiveGenerator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportArchiveGenerator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportArchiveGenerator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportArchiveGenerator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportGenerationException.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportGenerationException.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportGenerationException.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportGenerationException.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportUtils.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportUtils.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportUtils.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportUtils.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportWriter.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportWriter.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportWriter.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportWriter.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorDetail.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ValidatorDetail.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorDetail.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ValidatorDetail.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ValidatorResult.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorResult.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ValidatorResult.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/html/HtmlReportGenerator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/html/HtmlReportGenerator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/html/HtmlReportGenerator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/html/HtmlReportGenerator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/pdf/PdfReportGenerator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/pdf/PdfReportGenerator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/pdf/PdfReportGenerator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/pdf/PdfReportGenerator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/pdf/ReportBuilder.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/pdf/ReportBuilder.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/pdf/ReportBuilder.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/pdf/ReportBuilder.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/pdf/Templates.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/pdf/Templates.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/pdf/Templates.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/pdf/Templates.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceReport.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceReport.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceReport.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceReport.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceStatus.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceStatus.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceStatus.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceStatus.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileBuilder.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileBuilder.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileBuilder.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileBuilder.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileGenerator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileGenerator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileGenerator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileGenerator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/xml/JaxbConverter.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/xml/JaxbConverter.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/xml/JaxbConverter.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/xml/JaxbConverter.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/xml/XmlReportGenerator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/xml/XmlReportGenerator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/xml/XmlReportGenerator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/xml/XmlReportGenerator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidatorRule.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidatorRule.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidatorRule.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidatorRule.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesConfiguration.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesConfiguration.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesConfiguration.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesConfiguration.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesMainConfiguration.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesMainConfiguration.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesMainConfiguration.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesMainConfiguration.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesProfileConfiguration.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesProfileConfiguration.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesProfileConfiguration.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesProfileConfiguration.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptions.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptions.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptions.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptions.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfiguration.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfiguration.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfiguration.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfiguration.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationRetriever.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationRetriever.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationRetriever.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationRetriever.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/DefaultRulesMessagesAccessor.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/DefaultRulesMessagesAccessor.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/DefaultRulesMessagesAccessor.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/DefaultRulesMessagesAccessor.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/FileRulesMessagesAccessor.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/FileRulesMessagesAccessor.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/FileRulesMessagesAccessor.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/FileRulesMessagesAccessor.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/RulesMessagesAccessor.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/RulesMessagesAccessor.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/RulesMessagesAccessor.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/RulesMessagesAccessor.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesMetadata.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesMetadata.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesMetadata.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesMetadata.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersion.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersion.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersion.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersion.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParser.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParser.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParser.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParser.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetriever.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetriever.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetriever.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetriever.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/DelegatingSemanticProfileValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/DelegatingSemanticProfileValidator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/DelegatingSemanticProfileValidator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/DelegatingSemanticProfileValidator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfileValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfileValidator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfileValidator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfileValidator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfiles.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfiles.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfiles.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfiles.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidFeaturesResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidFeaturesResult.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidFeaturesResult.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidFeaturesResult.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidRuleResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidRuleResult.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidRuleResult.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidRuleResult.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/RuleResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/RuleResult.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/RuleResult.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/RuleResult.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResult.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResult.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResult.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/ValidationResultType.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/ValidationResultType.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/ValidationResultType.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/ValidationResultType.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRule.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRule.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRule.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRule.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidator.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidator.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidator.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorImpl.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorImpl.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorImpl.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorImpl.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/syntactic/report/SyntacticValidatorResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/syntactic/report/SyntacticValidatorResult.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/syntactic/report/SyntacticValidatorResult.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/syntactic/report/SyntacticValidatorResult.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/MapPreviewCreationException.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/MapPreviewCreationException.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/MapPreviewCreationException.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/MapPreviewCreationException.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/MapPreviewManager.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/MapPreviewManager.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/MapPreviewManager.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/MapPreviewManager.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/MasterportalConfigWriter.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/MasterportalConfigWriter.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/MasterportalConfigWriter.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/MasterportalConfigWriter.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/ValidatorWmsManager.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/ValidatorWmsManager.java similarity index 95% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/ValidatorWmsManager.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/ValidatorWmsManager.java index 1bbd1bb66b3142e60bd1c5f1c11cb7a4f221b21a..4a1bfdf3f7c68bb2cf599310354b593b9fc55d3d 100644 --- a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/ValidatorWmsManager.java +++ b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/ValidatorWmsManager.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% @@ -47,8 +47,9 @@ public class ValidatorWmsManager { /** * @param synthesizer used to synthesize the XPlan GML - * @param planStorage path to the workspace xplan-validator-wms-memory-workspace, the - * directory data is created if required + * @param planStorage path to the workspace + * xplan-webservices-validator-wms-memory-workspace, the directory data is created if + * required */ public ValidatorWmsManager(XPlanSynthesizer synthesizer, PlanStorage planStorage) { this.synthesizer = synthesizer; diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsContext.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsContext.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsContext.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsContext.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsSqlContext.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsSqlContext.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsSqlContext.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsSqlContext.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsWorkspaceContext.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsWorkspaceContext.java similarity index 95% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsWorkspaceContext.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsWorkspaceContext.java index 23e82823b0ed64d01d53ec317eb024302b20f5c6..e74279130e678d9459887c0abafc3e462a828a8c 100644 --- a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsWorkspaceContext.java +++ b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsWorkspaceContext.java @@ -41,7 +41,7 @@ public class ValidatorWmsWorkspaceContext { private static final Logger LOG = LoggerFactory.getLogger(ValidatorWmsWorkspaceContext.class); - private static final String XPLAN_GML_WMS_WORKSPACE = "xplan-validator-wms-memory-workspace"; + private static final String XPLAN_GML_WMS_WORKSPACE = "xplan-webservices-validator-wms-memory-workspace"; @Bean public PlanStorage planStorage() { diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/storage/PlanStorage.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/storage/PlanStorage.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/storage/PlanStorage.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/storage/PlanStorage.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorage.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorage.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorage.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorage.java diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/storage/WorkspacePlanStorage.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/storage/WorkspacePlanStorage.java similarity index 100% rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/storage/WorkspacePlanStorage.java rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/storage/WorkspacePlanStorage.java diff --git a/xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties b/xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties rename to xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties diff --git a/xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/i18n/validationMessages.properties b/xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/i18n/validationMessages.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/i18n/validationMessages.properties rename to xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/i18n/validationMessages.properties diff --git a/xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/semantic/configuration/rulesMessages.properties b/xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/semantic/configuration/rulesMessages.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/semantic/configuration/rulesMessages.properties rename to xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/semantic/configuration/rulesMessages.properties diff --git a/xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/wms/xplansyn.xml b/xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/wms/xplansyn.xml similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/wms/xplansyn.xml rename to xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/wms/xplansyn.xml diff --git a/xplan-core/xplan-validator-core/src/main/resources/jrxml/metadata.jrxml b/xplan-core/xplan-core-validator/src/main/resources/jrxml/metadata.jrxml similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/jrxml/metadata.jrxml rename to xplan-core/xplan-core-validator/src/main/resources/jrxml/metadata.jrxml diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/DOMMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/DOMMessages_de.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/DOMMessages_de.properties rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/DOMMessages_de.properties diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/DatatypeMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/DatatypeMessages_de.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/DatatypeMessages_de.properties rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/DatatypeMessages_de.properties diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/JAXPValidationMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/JAXPValidationMessages_de.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/JAXPValidationMessages_de.properties rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/JAXPValidationMessages_de.properties diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/SAXMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/SAXMessages_de.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/SAXMessages_de.properties rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/SAXMessages_de.properties diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XIncludeMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XIncludeMessages_de.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XIncludeMessages_de.properties rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XIncludeMessages_de.properties diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XMLMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XMLMessages_de.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XMLMessages_de.properties rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XMLMessages_de.properties diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XMLSchemaMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XMLSchemaMessages_de.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XMLSchemaMessages_de.properties rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XMLSchemaMessages_de.properties diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XMLSerializerMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XMLSerializerMessages_de.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XMLSerializerMessages_de.properties rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XMLSerializerMessages_de.properties diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XPointerMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XPointerMessages_de.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XPointerMessages_de.properties rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XPointerMessages_de.properties diff --git a/xplan-core/xplan-validator-core/src/main/resources/schemas/validationReport.xsd b/xplan-core/xplan-core-validator/src/main/resources/schemas/validationReport.xsd similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/schemas/validationReport.xsd rename to xplan-core/xplan-core-validator/src/main/resources/schemas/validationReport.xsd diff --git a/xplan-core/xplan-validator-core/src/main/resources/xslt/report.xslt b/xplan-core/xplan-core-validator/src/main/resources/xslt/report.xslt similarity index 100% rename from xplan-core/xplan-validator-core/src/main/resources/xslt/report.xslt rename to xplan-core/xplan-core-validator/src/main/resources/xslt/report.xslt diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/FeatureParserUtils.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/FeatureParserUtils.java similarity index 96% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/FeatureParserUtils.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/FeatureParserUtils.java index c2abda0a7aa4c7a97de9a60704cb2c50415b8c05..a68363264285d8204dcc0b634b0fa48dd1ea6966 100644 --- a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/FeatureParserUtils.java +++ b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/FeatureParserUtils.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.validator; -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; @@ -67,7 +66,7 @@ public class FeatureParserUtils { */ public static FeatureCollection readFeaturesFromZip(String name, FeatureInspector... inspectors) throws IOException, XMLStreamException, UnknownCRSException { - InputStream inputStream = ResourceAccessor.readResourceStream(name); + InputStream inputStream = FeatureParserUtils.class.getResourceAsStream("/testdata/" + name); return readFeaturesFromZip(name, inputStream, inspectors); } @@ -94,7 +93,7 @@ public class FeatureParserUtils { */ public static FeatureCollection readFeaturesFromGml(String name, FeatureInspector... inspectors) throws IOException, XMLStreamException, UnknownCRSException { - InputStream inputStream = ResourceAccessor.readResourceStream(name); + InputStream inputStream = FeatureParserUtils.class.getResourceAsStream("/testdata/" + name); return readFeaturesFromGml(name, inputStream, inspectors); } diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/XPlanValidatorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/XPlanValidatorTest.java similarity index 99% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/XPlanValidatorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/XPlanValidatorTest.java index 9f3e82ea10ec3613c7efee213075f868a742e829..872650c817a05f3d248321b6274287e3e47081d8 100644 --- a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/XPlanValidatorTest.java +++ b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/XPlanValidatorTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.validator; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.archive.XPlanArchive; import de.latlon.xplan.commons.feature.XPlanGmlParser; import de.latlon.xplan.commons.feature.XPlanGmlParserBuilder; @@ -103,7 +102,7 @@ public class XPlanValidatorTest { @BeforeClass public static void initFileToValidate() throws IOException { - InputStream input = ResourceAccessor.readResourceStream("xplan60/Blankenese29.gml"); + InputStream input = XPlanValidatorTest.class.getResourceAsStream("/testdata/xplan60/Blankenese29.gml"); Path xPlanGml = Files.createTempFile("XPlanValidatorTest", ".gml"); FileOutputStream output = new FileOutputStream(xPlanGml.toFile()); IOUtils.copy(input, output); diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParserTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParserTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParserTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParserTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/GeometricValidatorImplTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/GeometricValidatorImplTest.java similarity index 97% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/GeometricValidatorImplTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/GeometricValidatorImplTest.java index 1d53d5d04ce627bf982df251f904f23f5aca058d..4b39287820e70fd89e25232558e2371ea987e279 100644 --- a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/GeometricValidatorImplTest.java +++ b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/GeometricValidatorImplTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.validator.geometric; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.XPlanSchemas; import de.latlon.xplan.commons.XPlanVersion; import de.latlon.xplan.commons.archive.XPlanArchive; @@ -135,7 +134,7 @@ public class GeometricValidatorImplTest { private XPlanArchive getTestArchive(String name) throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); + return archiveCreator.createXPlanArchiveFromZip(name, getClass().getResourceAsStream("/testdata/" + name)); } private XPlanArchive getTestArchive(InputStream inputStream) throws IOException { diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/ParameterizedGeometricValidatorImplTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/ParameterizedGeometricValidatorImplTest.java similarity index 97% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/ParameterizedGeometricValidatorImplTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/ParameterizedGeometricValidatorImplTest.java index bbc7aa5f2a2ed8e3e2ccf1248851567c50eb1312..f053413c6f9b84973a10e51f7d8c9867426e959c 100644 --- a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/ParameterizedGeometricValidatorImplTest.java +++ b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/ParameterizedGeometricValidatorImplTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.validator.geometric; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.XPlanSchemas; import de.latlon.xplan.commons.XPlanVersion; import de.latlon.xplan.commons.archive.XPlanArchive; @@ -104,7 +103,7 @@ public class ParameterizedGeometricValidatorImplTest { private XPlanArchive getTestArchive(String name) throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); + return archiveCreator.createXPlanArchiveFromZip(name, getClass().getResourceAsStream("/testdata/" + name)); } } diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspectorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspectorTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspectorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspectorTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspectorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspectorTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspectorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspectorTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspectorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspectorTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspectorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspectorTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspectorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspectorTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspectorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspectorTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluatorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluatorTest.java similarity index 92% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluatorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluatorTest.java index e1cd9c6141ca98a4951a550f07f6d912c171f384..5af429652da8c6a77d5c421d6465fb27d6dbc2bd 100644 --- a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluatorTest.java +++ b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluatorTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.validator.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.XPlanFeatureCollection; @@ -43,7 +42,7 @@ public class ExternalReferenceEvaluatorTest { @Test public void testValidateExternalReferences_Avalaible() throws Exception { - InputStream inputStream = ResourceAccessor.readResourceStream("xplan60/Blankenese29_Test_60.zip"); + InputStream inputStream = getClass().getResourceAsStream("/testdata/xplan60/Blankenese29_Test_60.zip"); XPlanArchive xPlanArchive = new XPlanArchiveCreator().createXPlanArchiveFromZip("Blankenese29_Test_60", inputStream); XPlanFeatureCollection features = XPlanGmlParserBuilder.newBuilder() @@ -59,7 +58,7 @@ public class ExternalReferenceEvaluatorTest { @Test public void testValidateExternalReferences_Missing() throws Exception { - InputStream inputStream = ResourceAccessor.readResourceStream("xplan60/Blankenese29.gml"); + InputStream inputStream = getClass().getResourceAsStream("/testdata/xplan60/Blankenese29.gml"); XPlanArchive xPlanArchive = new XPlanArchiveCreator().createXPlanArchiveFromGml("Blankenese29", inputStream); XPlanFeatureCollection features = XPlanGmlParserBuilder.newBuilder() .build() @@ -74,7 +73,7 @@ public class ExternalReferenceEvaluatorTest { @Test public void testValidateExternalReferences_Http() throws Exception { - InputStream inputStream = ResourceAccessor.readResourceStream("xplan60/StErhVO_Hamm_60_httpRef.gml"); + InputStream inputStream = getClass().getResourceAsStream("/testdata/xplan60/StErhVO_Hamm_60_httpRef.gml"); XPlanArchive xPlanArchive = new XPlanArchiveCreator().createXPlanArchiveFromGml("StErhVO_Hamm_60_httpRef.gml", inputStream); XPlanFeatureCollection features = XPlanGmlParserBuilder.newBuilder() diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/ReportUtilsTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/ReportUtilsTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/ReportUtilsTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/ReportUtilsTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/ReportWriterTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/ReportWriterTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/ReportWriterTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/ReportWriterTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/ValidatorDetailTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/ValidatorDetailTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/ValidatorDetailTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/ValidatorDetailTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/html/HtmlReportGeneratorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/html/HtmlReportGeneratorTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/html/HtmlReportGeneratorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/html/HtmlReportGeneratorTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/pdf/PdfReportGeneratorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/pdf/PdfReportGeneratorTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/pdf/PdfReportGeneratorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/pdf/PdfReportGeneratorTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/pdf/ReportBuilderTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/pdf/ReportBuilderTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/pdf/ReportBuilderTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/pdf/ReportBuilderTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/shapefile/ShapefileGeneratorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/shapefile/ShapefileGeneratorTest.java similarity index 97% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/shapefile/ShapefileGeneratorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/shapefile/ShapefileGeneratorTest.java index a036e0a336d013701dd0d593135db106be01cf0c..0e123afa7b95dc590c7e98cb3ea7a31aff5b6ff4 100644 --- a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/shapefile/ShapefileGeneratorTest.java +++ b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/shapefile/ShapefileGeneratorTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.validator.report.shapefile; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.XPlanSchemas; import de.latlon.xplan.commons.XPlanVersion; import de.latlon.xplan.commons.archive.XPlanArchive; @@ -116,7 +115,7 @@ public class ShapefileGeneratorTest { private XPlanArchive getTestArchive(String name) throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); + return archiveCreator.createXPlanArchiveFromZip(name, getClass().getResourceAsStream("/testdata/" + name)); } private ValidatorResult validateGeometryAndReturnReport(XPlanArchive archive, List<ValidationOption> voOptions) diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/xml/XmlReportGeneratorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/xml/XmlReportGeneratorTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/xml/XmlReportGeneratorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/xml/XmlReportGeneratorTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/DefaultRulesMessagesAccessorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/DefaultRulesMessagesAccessorTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/DefaultRulesMessagesAccessorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/DefaultRulesMessagesAccessorTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/FileRulesMessagesAccessorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/FileRulesMessagesAccessorTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/FileRulesMessagesAccessorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/FileRulesMessagesAccessorTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptionsTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptionsTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptionsTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptionsTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParserTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParserTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParserTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParserTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetrieverTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetrieverTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetrieverTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetrieverTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreatorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreatorTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreatorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreatorTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/profile/TestContext.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/profile/TestContext.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/profile/TestContext.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/profile/TestContext.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResultTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResultTest.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResultTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResultTest.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRuleTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRuleTest.java similarity index 98% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRuleTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRuleTest.java index e17a84c39a1087db75e42cf1a2f31437c61f58ad..96e96cdbd9d18a3e59e7ec28b536e2e1f45f12ea 100644 --- a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRuleTest.java +++ b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRuleTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.validator.semantic.xquery; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.archive.XPlanArchive; import de.latlon.xplan.commons.archive.XPlanArchiveCreator; import de.latlon.xplan.validator.semantic.report.InvalidFeaturesResult; @@ -155,7 +154,7 @@ public class XQuerySemanticValidatorRuleTest { private XPlanArchive retrieveArchive(String name) throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); + return archiveCreator.createXPlanArchiveFromZip(name, getClass().getResourceAsStream("/testdata/" + name)); } } diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorTest.java similarity index 98% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorTest.java index 6182dde3fd9252945ea805f91e6d636e239cec0b..435219ad27df3ca4b3eb0f6a482813cb62f7b042 100644 --- a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorTest.java +++ b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.validator.semantic.xquery; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.archive.XPlanArchive; import de.latlon.xplan.commons.archive.XPlanArchiveCreator; import de.latlon.xplan.commons.configuration.SemanticConformityLinkConfiguration; @@ -140,7 +139,7 @@ public class XQuerySemanticValidatorTest { private XPlanArchive getTestArchive(String name) throws Exception { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); + return archiveCreator.createXPlanArchiveFromZip(name, getClass().getResourceAsStream("/testdata/" + name)); } private Path pathToSampleRules() throws URISyntaxException { diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/syntactic/ParameterizedSyntacticValidatorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/syntactic/ParameterizedSyntacticValidatorTest.java similarity index 95% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/syntactic/ParameterizedSyntacticValidatorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/syntactic/ParameterizedSyntacticValidatorTest.java index 3b738e03c2f652a91d851cde269c283034dac7bd..4adc4b3a550d236298bde1da6bd29b460495922c 100644 --- a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/syntactic/ParameterizedSyntacticValidatorTest.java +++ b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/syntactic/ParameterizedSyntacticValidatorTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.validator.syntactic; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.archive.XPlanArchive; import de.latlon.xplan.commons.archive.XPlanArchiveCreator; import org.junit.Test; @@ -68,7 +67,7 @@ public class ParameterizedSyntacticValidatorTest { private XPlanArchive getTestArchive(String name) throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); + return archiveCreator.createXPlanArchiveFromZip(name, getClass().getResourceAsStream("/testdata/" + name)); } } diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorTest.java similarity index 94% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorTest.java index 9d1116d65b943a9174e20d7cc89eae5089896f11..bbc86fc5c105069bb0f704ab7e384e48633fcf61 100644 --- a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorTest.java +++ b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.validator.syntactic; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.archive.XPlanArchive; import de.latlon.xplan.commons.archive.XPlanArchiveCreator; import de.latlon.xplan.validator.syntactic.report.SyntacticValidatorResult; @@ -55,7 +54,7 @@ public class SyntacticValidatorTest { private XPlanArchive getTestArchive(String name) throws IOException { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); - return archiveCreator.createXPlanArchiveFromZip(name, ResourceAccessor.readResourceStream(name)); + return archiveCreator.createXPlanArchiveFromZip(name, getClass().getResourceAsStream("/testdata/" + name)); } } diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/ValidatorWmsManagerTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/ValidatorWmsManagerTest.java similarity index 97% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/ValidatorWmsManagerTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/ValidatorWmsManagerTest.java index e91a6134f0f594889d95b8272046ddaa4f9a7dc9..72514f7dd476dd5e2a34d6608216ba8363b94e59 100644 --- a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/ValidatorWmsManagerTest.java +++ b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/ValidatorWmsManagerTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.validator.wms; -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.XPlanFeatureCollection; @@ -67,7 +66,7 @@ public class ValidatorWmsManagerTest { private XPlanFeatureCollection parseFeatureCollection(String name) throws Exception { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchive archive = archiveCreator.createXPlanArchiveFromZip(name, - ResourceAccessor.readResourceStream(name)); + getClass().getResourceAsStream("/testdata/" + name)); return XPlanGmlParserBuilder.newBuilder().build().parseXPlanFeatureCollection(archive); } diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/config/TestContext.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/config/TestContext.java similarity index 100% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/config/TestContext.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/config/TestContext.java diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorageTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorageTest.java similarity index 97% rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorageTest.java rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorageTest.java index 38fe2ba847a5e611843d45fb9b97d7cd2798780a..d8d6015b970b02549853d4a22cdd01a493c560fa 100644 --- a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorageTest.java +++ b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorageTest.java @@ -20,7 +20,6 @@ */ package de.latlon.xplan.validator.wms.storage; -import de.latlon.xplan.ResourceAccessor; import de.latlon.xplan.commons.XPlanSchemas; import de.latlon.xplan.commons.archive.XPlanArchive; import de.latlon.xplan.commons.archive.XPlanArchiveCreator; @@ -74,7 +73,7 @@ public class SqlPlanStorageTest { private XPlanFeatureCollection parseFeatureCollection(String name) throws Exception { XPlanArchiveCreator archiveCreator = new XPlanArchiveCreator(); XPlanArchive archive = archiveCreator.createXPlanArchiveFromZip(name, - ResourceAccessor.readResourceStream(name)); + getClass().getResourceAsStream("/testdata/" + name)); return XPlanGmlParserBuilder.newBuilder().build().parseXPlanFeatureCollection(archive); } diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidId.yaml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidId.yaml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidId.yaml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidId.yaml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidName.yaml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidName.yaml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidName.yaml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidName.yaml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profile.yaml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profile.yaml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profile.yaml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profile.yaml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateId.yaml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateId.yaml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateId.yaml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateId.yaml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateName.yaml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateName.yaml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateName.yaml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateName.yaml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profiles.yaml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profiles.yaml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profiles.yaml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profiles.yaml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/rules/rules.properties b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/rules/rules.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/rules/rules.properties rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/rules/rules.properties diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/rules/version.properties b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/rules/version.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/rules/version.properties rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/rules/version.properties diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/curve.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/curve.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/curve.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/curve.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/duplicateControlPointRing.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/duplicateControlPointRing.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/duplicateControlPointRing.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/duplicateControlPointRing.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationInvalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationInvalid.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationInvalid.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationInvalid.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationValid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationValid.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationValid.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationValid.gml diff --git a/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/identicalControlPoints.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/identicalControlPoints.gml new file mode 100644 index 0000000000000000000000000000000000000000..fbc3454d57ceec850b6055fe2dcb81b4bb13f0ad --- /dev/null +++ b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/identicalControlPoints.gml @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + #%L + xplan-validator-core - XPlan Validator Core Komponente + %% + Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + +<XPlanAuszug xmlns:xplan="http://www.xplanung.de/xplangml/5/1" xmlns:gml="http://www.opengis.net/gml/3.2" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.xplanung.de/xplangml/5/1 file:///D:/Daten/Dev/XPlanGML/Version_5.1/Spezifikation/XPlanGML_5_1_Schema/XPlanung-Operationen.xsd" + gml:id="GML_1a978dea-a2b0-4821-92a3-2cb15b4de112" xmlns="http://www.xplanung.de/xplangml/5/1"> + <gml:boundedBy> + <gml:Envelope srsName="EPSG:25832"> + <gml:lowerCorner>572078.872 5938478.965</gml:lowerCorner> + <gml:upperCorner>572225.523 5938671.367</gml:upperCorner> + </gml:Envelope> + </gml:boundedBy> + <gml:featureMember> + <xplan:BP_Plan gml:id="GML_fe335223-6664-4a70-bcdb-fc56b0c4c99c"> + <gml:boundedBy> + <gml:Envelope srsName="EPSG:25832"> + <gml:lowerCorner>572078.872 5938478.965</gml:lowerCorner> + <gml:upperCorner>572225.523 5938671.367</gml:upperCorner> + </gml:Envelope> + </gml:boundedBy> + <xplan:name>Laufrichtung</xplan:name> + <xplan:erstellungsMassstab>1000</xplan:erstellungsMassstab> + <xplan:raeumlicherGeltungsbereich> + <gml:MultiSurface srsName="EPSG:25832" gml:id="GML_bce46968-7f95-405c-acad-6e5c9674a98c"> + <gml:surfaceMember> + <gml:Polygon srsName="EPSG:25832" gml:id="GML_7ce62277-0aa1-4b4f-a50c-aae9728286f4"> + <gml:exterior> + <gml:Ring> + <gml:curveMember> + <gml:Curve srsName="EPSG:25832" gml:id="GML_2736d7d0-4494-48c2-86ea-635130e68121"> + <gml:segments> + <gml:LineStringSegment interpolation="linear"> + <gml:posList srsDimension="2" count="7">572209.380 5938582.980 572183.015 5938671.367 + 572166.198 5938665.141 572135.549 5938653.793 572083.047 5938634.355 572078.872 5938625.272 + 572116.844 5938522.692 + </gml:posList> + </gml:LineStringSegment> + <gml:ArcString interpolation="circularArc3Points"> + <gml:posList srsDimension="2" count="7">572116.844 5938522.692 572119.846 5938515.711 + 572123.546 5938509.074 572130.282 5938501.276 572139.043 5938495.852 572146.175 5938493.244 + 572153.536 5938491.380 + </gml:posList> + </gml:ArcString> + <gml:LineStringSegment interpolation="linear"> + <gml:posList srsDimension="2" count="3">572153.536 5938491.380 572168.119 5938488.476 + 572194.546 5938483.212 + </gml:posList> + </gml:LineStringSegment> + <gml:ArcString interpolation="circularArc3Points"> + <gml:posList srsDimension="2" count="5">572194.546 5938483.212 572195.728 5938482.968 + 572196.907 5938482.708 572203.063 5938481.062 572209.080 5938478.965 + </gml:posList> + </gml:ArcString> + <gml:LineStringSegment interpolation="linear"> + <gml:posList srsDimension="2" count="4">572209.080 5938478.965 572225.523 5938528.858 + 572213.862 5938567.956 572209.380 5938582.980 + </gml:posList> + </gml:LineStringSegment> + </gml:segments> + </gml:Curve> + </gml:curveMember> + </gml:Ring> + </gml:exterior> + </gml:Polygon> + </gml:surfaceMember> + </gml:MultiSurface> + </xplan:raeumlicherGeltungsbereich> + <xplan:gemeinde> + <xplan:XP_Gemeinde> + <xplan:ags>02000000</xplan:ags> + <xplan:gemeindeName>Freie und Hansestadt Hamburg</xplan:gemeindeName> + </xplan:XP_Gemeinde> + </xplan:gemeinde> + <xplan:planArt>1000</xplan:planArt> + <xplan:verfahren>1000</xplan:verfahren> + <xplan:rechtsstand>2000</xplan:rechtsstand> + <xplan:veraenderungssperre>false</xplan:veraenderungssperre> + <xplan:staedtebaulicherVertrag>false</xplan:staedtebaulicherVertrag> + <xplan:erschliessungsVertrag>false</xplan:erschliessungsVertrag> + <xplan:durchfuehrungsVertrag>false</xplan:durchfuehrungsVertrag> + <xplan:gruenordnungsplan>false</xplan:gruenordnungsplan> + <xplan:bereich xlink:href="#GML_e71a8674-27f4-49db-b10c-76917ec8d943"/> + </xplan:BP_Plan> + </gml:featureMember> + <gml:featureMember> + <xplan:BP_Bereich gml:id="GML_e71a8674-27f4-49db-b10c-76917ec8d943"> + <gml:boundedBy> + <gml:Envelope srsName="EPSG:25832"> + <gml:lowerCorner>572096.049 5938603.521</gml:lowerCorner> + <gml:upperCorner>572191.282 5938571.917</gml:upperCorner> + </gml:Envelope> + </gml:boundedBy> + <xplan:nummer>1</xplan:nummer> + <xplan:planinhalt xlink:href="#GML_88258139-e3ff-4388-9838-a30775e1f8bf"/> + <xplan:gehoertZuPlan xlink:href="#GML_fe335223-6664-4a70-bcdb-fc56b0c4c99c"/> + </xplan:BP_Bereich> + </gml:featureMember> + <gml:featureMember> + <xplan:BP_BaugebietsTeilFlaeche gml:id="GML_88258139-e3ff-4388-9838-a30775e1f8bf"> + <gml:boundedBy> + <gml:Envelope srsName="EPSG:25832"> + <gml:lowerCorner>572078.872 5938482.708</gml:lowerCorner> + <gml:upperCorner>572210.848 5938665.141</gml:upperCorner> + </gml:Envelope> + </gml:boundedBy> + <xplan:ebene>0</xplan:ebene> + <xplan:gehoertZuBereich xlink:href="#GML_e71a8674-27f4-49db-b10c-76917ec8d943"/> + <xplan:rechtscharakter>1000</xplan:rechtscharakter> + <xplan:position> + <gml:Polygon srsName="EPSG:25832" gml:id="GML_45ddaf05-73a8-42dd-b7ef-fe3549c449e1"> + <gml:exterior> + <gml:Ring> + <gml:curveMember> + <gml:Curve srsName="EPSG:25832" gml:id="GML_1ba62067-b84e-4568-a5f1-ab67b514f852"> + <gml:segments> + <gml:LineStringSegment interpolation="linear"> + <gml:posList srsDimension="2" count="2">572078.872 5938625.272 572116.844 5938522.692 + </gml:posList> + </gml:LineStringSegment> + <gml:ArcString interpolation="circularArc3Points"> + <gml:posList srsDimension="2" count="7">572116.844 5938522.692 572119.846 5938515.711 572123.546 + 5938509.074 572130.282 5938501.276 572139.043 5938495.852 572146.175 5938493.244 572153.536 + 5938491.380 + </gml:posList> + </gml:ArcString> + <gml:LineStringSegment interpolation="linear"> + <gml:posList srsDimension="2" count="3">572153.536 5938491.380 572168.119 5938488.476 572194.546 + 5938483.212 + </gml:posList> + </gml:LineStringSegment> + <gml:ArcString interpolation="circularArc3Points"> + <gml:posList srsDimension="2" count="3">572194.546 5938483.212 572195.728 5938482.968 572196.907 + 5938482.708 + </gml:posList> + </gml:ArcString> + <gml:LineStringSegment interpolation="linear"> + <!-- Identischer Stuetzpunkt 572210.848 5938527.335 --> + <gml:posList srsDimension="2" count="8">572196.907 5938482.708 572210.848 5938527.335 572210.848 5938527.335 572194.430 + 5938578.006 572166.198 5938665.141 572135.549 5938653.793 572083.047 5938634.355 572078.872 + 5938625.272 + </gml:posList> + </gml:LineStringSegment> + </gml:segments> + </gml:Curve> + </gml:curveMember> + </gml:Ring> + </gml:exterior> + <gml:interior> + <gml:Ring> + <gml:curveMember> + <gml:Curve srsName="EPSG:25832" gml:id="GML_e1176420-6223-4f27-ba63-acc8dfed2329"> + <gml:segments> + <gml:LineStringSegment interpolation="linear"> + <gml:posList srsDimension="2" count="2">572117.933 5938592.407 572162.867 5938610.212 + </gml:posList> + </gml:LineStringSegment> + <gml:ArcString interpolation="circularArc3Points"> + <gml:posList srsDimension="2" count="3">572162.867 5938610.212 572173.569 5938595.846 572175.612 + 5938578.049 + </gml:posList> + </gml:ArcString> + <gml:LineStringSegment interpolation="linear"> + <gml:posList srsDimension="2" count="4">572175.612 5938578.049 572129.681 5938559.849 572111.552 + 5938575.664 572117.933 5938592.407 + </gml:posList> + </gml:LineStringSegment> + </gml:segments> + </gml:Curve> + </gml:curveMember> + </gml:Ring> + </gml:interior> + </gml:Polygon> + </xplan:position> + <xplan:flaechenschluss>true</xplan:flaechenschluss> + <xplan:GRZ>0.4</xplan:GRZ> + <xplan:besondereArtDerBaulNutzung>1200</xplan:besondereArtDerBaulNutzung> + </xplan:BP_BaugebietsTeilFlaeche> + </gml:featureMember> +</XPlanAuszug> diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertPlanUndAendertPlanBereich.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertPlanUndAendertPlanBereich.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertPlanUndAendertPlanBereich.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertPlanUndAendertPlanBereich.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertUndWurdeGeandertVon.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertUndWurdeGeandertVon.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertUndWurdeGeandertVon.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertUndWurdeGeandertVon.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/BPlan_6-0_4-5-2-4-Ueberlappung_valide.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/BPlan_6-0_4-5-2-4-Ueberlappung_valide.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/BPlan_6-0_4-5-2-4-Ueberlappung_valide.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/BPlan_6-0_4-5-2-4-Ueberlappung_valide.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/xplan60-4_5_2_4.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/xplan60-4_5_2_4.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/xplan60-4_5_2_4.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/xplan60-4_5_2_4.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gfs b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gfs similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gfs rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gfs diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan001_5-4_Toleranz_Geltungsbereich_0008.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan001_5-4_Toleranz_Geltungsbereich_0008.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan001_5-4_Toleranz_Geltungsbereich_0008.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan001_5-4_Toleranz_Geltungsbereich_0008.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Luecke.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Luecke.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Luecke.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Luecke.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Ueberlappung.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Ueberlappung.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Ueberlappung.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Ueberlappung.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_TeilbereichAusserhalbPlanbereich_6-0-2.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_TeilbereichAusserhalbPlanbereich_6-0-2.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_TeilbereichAusserhalbPlanbereich_6-0-2.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_TeilbereichAusserhalbPlanbereich_6-0-2.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_invalide.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_invalide.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_invalide.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_invalide.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_valide.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_valide.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_valide.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_valide.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_031545401000_Zusammenzeichnung.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_031545401000_Zusammenzeichnung.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_031545401000_Zusammenzeichnung.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_031545401000_Zusammenzeichnung.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_Insel-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_Insel-Test.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_Insel-Test.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_Insel-Test.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm-nichtUeberlappend.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm-nichtUeberlappend.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm-nichtUeberlappend.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm-nichtUeberlappend.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Insel_Luecke_5mm.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Insel_Luecke_5mm.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Insel_Luecke_5mm.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Insel_Luecke_5mm.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Luecke.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Luecke.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Luecke.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Luecke.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_kein-flaechenschluss.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_kein-flaechenschluss.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_kein-flaechenschluss.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_kein-flaechenschluss.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_wirksamkeit.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_wirksamkeit.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_wirksamkeit.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_wirksamkeit.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/equalFlaechenschlussGeometries.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/equalFlaechenschlussGeometries.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/equalFlaechenschlussGeometries.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/equalFlaechenschlussGeometries.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_1_Flaechenschlussfehler.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_1_Flaechenschlussfehler.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_1_Flaechenschlussfehler.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_1_Flaechenschlussfehler.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_2_Flaechenschlussfehler.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_2_Flaechenschlussfehler.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_2_Flaechenschlussfehler.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_2_Flaechenschlussfehler.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_5_4_2_Flaechenschlussfehler.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_5_4_2_Flaechenschlussfehler.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_5_4_2_Flaechenschlussfehler.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_5_4_2_Flaechenschlussfehler.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_Luecke_Geltungsbereich.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_Luecke_Geltungsbereich.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_Luecke_Geltungsbereich.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_Luecke_Geltungsbereich.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_vollstaendige_Ueberlappung.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_vollstaendige_Ueberlappung.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_vollstaendige_Ueberlappung.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_vollstaendige_Ueberlappung.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan53-4_1_7_1_Flaechenschlussfehler.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan53-4_1_7_1_Flaechenschlussfehler.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan53-4_1_7_1_Flaechenschlussfehler.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan53-4_1_7_1_Flaechenschlussfehler.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan54_Flaechenschlussfehler_Luecken.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan54_Flaechenschlussfehler_Luecken.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan54_Flaechenschlussfehler_Luecken.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan54_Flaechenschlussfehler_Luecken.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_Luecke.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_Luecke.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_Luecke.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_Luecke.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_valide.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_valide.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_valide.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_valide.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Geltungsbereich-Test.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Geltungsbereich-Test.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Geltungsbereich-Test.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Schnittpunkte_Geltungsbereich_Polygon.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Schnittpunkte_Geltungsbereich_Polygon.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Schnittpunkte_Geltungsbereich_Polygon.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Schnittpunkte_Geltungsbereich_Polygon.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Geltungsbereich-Test.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Geltungsbereich-Test.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Geltungsbereich-Test.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Schnittpunkte_Geltungsbereich_Polygon.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Schnittpunkte_Geltungsbereich_Polygon.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Schnittpunkte_Geltungsbereich_Polygon.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Schnittpunkte_Geltungsbereich_Polygon.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Geltungsbereich-Test.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Geltungsbereich-Test.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Geltungsbereich-Test.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Schnittpunkte_Geltungsbereich_Polygon.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Schnittpunkte_Geltungsbereich_Polygon.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Schnittpunkte_Geltungsbereich_Polygon.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Schnittpunkte_Geltungsbereich_Polygon.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Geltungsbereich-Test.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Geltungsbereich-Test.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Geltungsbereich-Test.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Schnittpunkte_Geltungsbereich_Polygon.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Schnittpunkte_Geltungsbereich_Polygon.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Schnittpunkte_Geltungsbereich_Polygon.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Schnittpunkte_Geltungsbereich_Polygon.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Geltungsbereich-Test.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Geltungsbereich-Test.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Geltungsbereich-Test.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Schnittpunkte_Geltungsbereich_Linie.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Schnittpunkte_Geltungsbereich_Linie.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Schnittpunkte_Geltungsbereich_Linie.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Schnittpunkte_Geltungsbereich_Linie.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Geltungsbereich-Test.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Geltungsbereich-Test.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Geltungsbereich-Test.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Schnittpunkte_Geltungsbereich_Linie.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Schnittpunkte_Geltungsbereich_Linie.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Schnittpunkte_Geltungsbereich_Linie.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Schnittpunkte_Geltungsbereich_Linie.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Geltungsbereich-Test.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Geltungsbereich-Test.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Geltungsbereich-Test.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Schnittpunkte_Geltungsbereich_Linie.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Schnittpunkte_Geltungsbereich_Linie.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Schnittpunkte_Geltungsbereich_Linie.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Schnittpunkte_Geltungsbereich_Linie.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/8_Schnittpunkte_Geltungsbereich_Linie.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/8_Schnittpunkte_Geltungsbereich_Linie.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/8_Schnittpunkte_Geltungsbereich_Linie.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/8_Schnittpunkte_Geltungsbereich_Linie.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan001_5-4_Sliver-Polygon.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan001_5-4_Sliver-Polygon.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan001_5-4_Sliver-Polygon.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan001_5-4_Sliver-Polygon.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan002_5-2_Schnittpunkt_Geltungsbereich.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan002_5-2_Schnittpunkt_Geltungsbereich.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan002_5-2_Schnittpunkt_Geltungsbereich.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan002_5-2_Schnittpunkt_Geltungsbereich.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Kompensationsbereich_6-0-2_valide.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Kompensationsbereich_6-0-2_valide.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Kompensationsbereich_6-0-2_valide.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Kompensationsbereich_6-0-2_valide.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Teilbereich_6-0-2_invalide.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Teilbereich_6-0-2_invalide.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Teilbereich_6-0-2_invalide.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Teilbereich_6-0-2_invalide.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/HafenCity11_HafenCity14_Bereich_ohne_Geometrie.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/HafenCity11_HafenCity14_Bereich_ohne_Geometrie.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/HafenCity11_HafenCity14_Bereich_ohne_Geometrie.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/HafenCity11_HafenCity14_Bereich_ohne_Geometrie.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/SystematischeGeltungsbereichspruefung_GPundGB.jpg b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/SystematischeGeltungsbereichspruefung_GPundGB.jpg similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/SystematischeGeltungsbereichspruefung_GPundGB.jpg rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/SystematischeGeltungsbereichspruefung_GPundGB.jpg diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereich.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereich.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereich.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereich.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereichLoch.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereichLoch.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereichLoch.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereichLoch.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/V4_1_ID_103_withtolerance.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/V4_1_ID_103_withtolerance.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/V4_1_ID_103_withtolerance.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/V4_1_ID_103_withtolerance.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/invalidSelfintersectionDeteced.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/invalidSelfintersectionDeteced.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/invalidSelfintersectionDeteced.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/invalidSelfintersectionDeteced.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-covering.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-covering.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-covering.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-covering.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersection.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersection.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersection.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersection.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersectionInIntersection.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersectionInIntersection.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersectionInIntersection.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersectionInIntersection.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-touches.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-touches.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-touches.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-touches.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygon-orientation-invalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygon-orientation-invalid.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygon-orientation-invalid.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygon-orientation-invalid.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing-touching.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing-touching.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing-touching.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing-touching.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRings-touching.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRings-touching.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRings-touching.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRings-touching.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRIng-2intersections.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRIng-2intersections.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRIng-2intersections.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRIng-2intersections.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing-samePoint.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing-samePoint.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing-samePoint.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing-samePoint.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/surface.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/surface.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/surface.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/surface.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/exists.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/exists.xq similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/exists.xq rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/exists.xq diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/falseStatement.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/falseStatement.xq similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/falseStatement.xq rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/falseStatement.xq diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId-warningsAndErrors.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId-warningsAndErrors.xq similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId-warningsAndErrors.xq rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId-warningsAndErrors.xq diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId.xq similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId.xq rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId.xq diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlIds.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlIds.xq similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlIds.xq rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlIds.xq diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.unrule b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.unrule similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.unrule rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.unrule diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.xq similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.xq rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.xq diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/sub/Sub.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/sub/Sub.xq similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/sub/Sub.xq rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/sub/Sub.xq diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml40/hello.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml40/hello.xq similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml40/hello.xq rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml40/hello.xq diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/41.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/41.xq similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/41.xq rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/41.xq diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/41_XPignore.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/41_XPignore.xq similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/41_XPignore.xq rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/41_XPignore.xq diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/subXp/41_XPignore_Sub.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/subXp/41_XPignore_Sub.xq similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/subXp/41_XPignore_Sub.xq rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/subXp/41_XPignore_Sub.xq diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP2070.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP2070.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP2070.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP2070.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-LineString.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-LineString.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-LineString.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-LineString.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussFalse.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussFalse.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussFalse.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussFalse.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussTrue.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussTrue.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussTrue.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussTrue.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-LineString.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-LineString.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-LineString.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-LineString.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussFalse.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussFalse.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussFalse.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussFalse.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussTrue.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussTrue.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussTrue.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussTrue.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-bereich-invalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-bereich-invalid.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-bereich-invalid.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-bereich-invalid.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuBereich-invalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuBereich-invalid.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuBereich-invalid.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuBereich-invalid.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuPlan-invalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuPlan-invalid.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuPlan-invalid.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuPlan-invalid.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-planinhalt-invalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-planinhalt-invalid.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-planinhalt-invalid.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-planinhalt-invalid.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-refBegruendungInhalt-invalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-refBegruendungInhalt-invalid.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-refBegruendungInhalt-invalid.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-refBegruendungInhalt-invalid.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/FPlan.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/FPlan.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/FPlan.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/FPlan.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/LA67.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/LA67.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/LA67.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/LA67.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/V4_1_ID_103.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/V4_1_ID_103.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/V4_1_ID_103.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/V4_1_ID_103.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_AnpflanzungBindungErhaltung-Polygon-flaechenschlussTrue.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_AnpflanzungBindungErhaltung-Polygon-flaechenschlussTrue.xml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_AnpflanzungBindungErhaltung-Polygon-flaechenschlussTrue.xml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_AnpflanzungBindungErhaltung-Polygon-flaechenschlussTrue.xml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_BaugebietsTeilFlaeche-GFZ_GF_GRZ_GZ.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_BaugebietsTeilFlaeche-GFZ_GF_GRZ_GZ.xml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_BaugebietsTeilFlaeche-GFZ_GF_GRZ_GZ.xml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_BaugebietsTeilFlaeche-GFZ_GF_GRZ_GZ.xml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-mehrfacheZBUndWeitere.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-mehrfacheZBUndWeitere.xml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-mehrfacheZBUndWeitere.xml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-mehrfacheZBUndWeitere.xml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-nurWeitereZB.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-nurWeitereZB.xml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-nurWeitereZB.xml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-nurWeitereZB.xml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_UnverbindlicheVormerkung-Polygon-flaechenschlussTrue.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_UnverbindlicheVormerkung-Polygon-flaechenschlussTrue.xml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_UnverbindlicheVormerkung-Polygon-flaechenschlussTrue.xml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_UnverbindlicheVormerkung-Polygon-flaechenschlussTrue.xml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_Wegerecht-Polygon-flaechenschlussFehlt.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_Wegerecht-Polygon-flaechenschlussFehlt.xml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_Wegerecht-Polygon-flaechenschlussFehlt.xml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_Wegerecht-Polygon-flaechenschlussFehlt.xml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/XP_PPO-positionPoint-keinFlaechenschluss.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/XP_PPO-positionPoint-keinFlaechenschluss.xml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/XP_PPO-positionPoint-keinFlaechenschluss.xml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/XP_PPO-positionPoint-keinFlaechenschluss.xml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/inhaltBPPlan-referenziertSO.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/inhaltBPPlan-referenziertSO.xml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/inhaltBPPlan-referenziertSO.xml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/inhaltBPPlan-referenziertSO.xml diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/xplan.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/xplan.gml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/xplan.gml rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/xplan.gml diff --git a/xplan-core/xplan-validator-core/src/test/resources/log4j2-test.yaml b/xplan-core/xplan-core-validator/src/test/resources/log4j2-test.yaml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/log4j2-test.yaml rename to xplan-core/xplan-core-validator/src/test/resources/log4j2-test.yaml diff --git a/xplan-core/xplan-validator-core/src/test/resources/profiles-test1.yml b/xplan-core/xplan-core-validator/src/test/resources/profiles-test1.yml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/profiles-test1.yml rename to xplan-core/xplan-core-validator/src/test/resources/profiles-test1.yml diff --git a/xplan-core/xplan-validator-core/src/test/resources/profiles-test2.yaml b/xplan-core/xplan-core-validator/src/test/resources/profiles-test2.yaml similarity index 100% rename from xplan-core/xplan-validator-core/src/test/resources/profiles-test2.yaml rename to xplan-core/xplan-core-validator/src/test/resources/profiles-test2.yaml diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan40/BPlan004_4-0.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan40/BPlan004_4-0.zip new file mode 100644 index 0000000000000000000000000000000000000000..54503ca4765d0beb2431066f42186cb89c88ddfd Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan40/BPlan004_4-0.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/BP2070.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/BP2070.zip new file mode 100644 index 0000000000000000000000000000000000000000..82a65a05895e235b1db4bb7583736e0cc033b977 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/BP2070.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/BP2135.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/BP2135.zip new file mode 100644 index 0000000000000000000000000000000000000000..eb02168db160858d255dfdd508cc40270826ccd4 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/BP2135.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/BPlan001_4-1.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/BPlan001_4-1.zip new file mode 100644 index 0000000000000000000000000000000000000000..c1e48575248a866bd13ca0e57d60f040900e5586 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/BPlan001_4-1.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/Demo.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/Demo.zip new file mode 100644 index 0000000000000000000000000000000000000000..4494ac8a3159b1ece3afd8fb60d746a438f29792 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/Demo.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-broken-geometry.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/Eidelstedt_4_V4-broken-geometry.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-broken-geometry.zip rename to xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/Eidelstedt_4_V4-broken-geometry.zip diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/Eidelstedt_4_V4.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/Eidelstedt_4_V4.zip new file mode 100644 index 0000000000000000000000000000000000000000..bc694d6127aa42723891642fe2e19759bcb9aed7 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/Eidelstedt_4_V4.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4_Syntaxfehler.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/Eidelstedt_4_V4_Syntaxfehler.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4_Syntaxfehler.zip rename to xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/Eidelstedt_4_V4_Syntaxfehler.zip diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/FPlan.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/FPlan.zip new file mode 100644 index 0000000000000000000000000000000000000000..1595f9276098207c5be2b4fb830555a014a13256 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/FPlan.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/LA22.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/LA22.zip new file mode 100644 index 0000000000000000000000000000000000000000..259b9daff9bf364f880f97229d22e19e02956ed3 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/LA22.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/LA67.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/LA67.zip new file mode 100644 index 0000000000000000000000000000000000000000..0e4f51a322b2af16e85e9e1889203472422ec4c6 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/LA67.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/PlanWithComplexCurve.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/PlanWithComplexCurve.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/PlanWithComplexCurve.zip rename to xplan-core/xplan-core-validator/src/test/resources/testdata/xplan41/PlanWithComplexCurve.zip diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/BP2070.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/BP2070.zip new file mode 100644 index 0000000000000000000000000000000000000000..809dd4c91e1ac21543cf56d19b8b0fabfcd8dae8 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/BP2070.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/BP2135.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/BP2135.zip new file mode 100644 index 0000000000000000000000000000000000000000..937d56c706f31bde8e79b0ba34c0e4d26d64de8c Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/BP2135.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/FPlan.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/FPlan.zip new file mode 100644 index 0000000000000000000000000000000000000000..19e5e1e7c14289b98db39d07aa34b2b88485060c Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/FPlan.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/LA22.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/LA22.zip new file mode 100644 index 0000000000000000000000000000000000000000..e71bbc375bbd6e0931114255764070648a8d7a13 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/LA22.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/LA67.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/LA67.zip new file mode 100644 index 0000000000000000000000000000000000000000..a7b9cb4d3725d052a7507245a5d99cdd0f562fa4 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan50/LA67.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/BP2070.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/BP2070.zip new file mode 100644 index 0000000000000000000000000000000000000000..58ae8eaf46d2db3e31d4bb3c073952dd01b33760 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/BP2070.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/BP2135.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/BP2135.zip new file mode 100644 index 0000000000000000000000000000000000000000..d42e7282bda57af39ccf00abf7e6e534c358dd16 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/BP2135.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BPlan001_5-1.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/BPlan001_5-1.zip similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan51/BPlan001_5-1.zip rename to xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/BPlan001_5-1.zip diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/FPlan.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/FPlan.zip new file mode 100644 index 0000000000000000000000000000000000000000..f7db923394fc1c564e601a8acff485be3f41dbfd Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/FPlan.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/LA22.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/LA22.zip new file mode 100644 index 0000000000000000000000000000000000000000..9b90125186d08303121c750b069c7b9e64d22cea Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/LA22.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/LA67.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/LA67.zip new file mode 100644 index 0000000000000000000000000000000000000000..311371ba632f4b47b5db84967936d51a7fddd262 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan51/LA67.zip differ diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan60/BPlan001_6-0.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan60/BPlan001_6-0.zip new file mode 100644 index 0000000000000000000000000000000000000000..384cb16f5781e687914b9d7019cb5195fcea65ff Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan60/BPlan001_6-0.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/Blankenese29.gml b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan60/Blankenese29.gml similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/Blankenese29.gml rename to xplan-core/xplan-core-validator/src/test/resources/testdata/xplan60/Blankenese29.gml diff --git a/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan60/Blankenese29_Test_60.zip b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan60/Blankenese29_Test_60.zip new file mode 100644 index 0000000000000000000000000000000000000000..f06a77683ea2545303b80bc7ec7e0a5fb4797093 Binary files /dev/null and b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan60/Blankenese29_Test_60.zip differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/StErhVO_Hamm_60_httpRef.gml b/xplan-core/xplan-core-validator/src/test/resources/testdata/xplan60/StErhVO_Hamm_60_httpRef.gml similarity index 100% rename from xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan60/StErhVO_Hamm_60_httpRef.gml rename to xplan-core/xplan-core-validator/src/test/resources/testdata/xplan60/StErhVO_Hamm_60_httpRef.gml diff --git a/xplan-core/xplan-validator-core/src/xjc/bindings.xjc b/xplan-core/xplan-core-validator/src/xjc/bindings.xjc similarity index 100% rename from xplan-core/xplan-validator-core/src/xjc/bindings.xjc rename to xplan-core/xplan-core-validator/src/xjc/bindings.xjc diff --git a/xplan-resources/pom.xml b/xplan-database/pom.xml similarity index 74% rename from xplan-resources/pom.xml rename to xplan-database/pom.xml index 206b4be78d832683550413dcac6ef12fc079c952..3bd2d5d467db3ee56b9917d4d894efb7fba9e857 100644 --- a/xplan-resources/pom.xml +++ b/xplan-database/pom.xml @@ -1,9 +1,9 @@ <?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-resources</artifactId> + <artifactId>xplan-database</artifactId> <packaging>pom</packaging> - <description>Modul zur Gruppierung aller Ressourcen</description> + <description>Modul zur Gruppierung aller zur XPlanDB gehoerigen Module</description> <parent> <groupId>de.latlon.product.xplanbox</groupId> @@ -12,8 +12,7 @@ </parent> <modules> - <module>xplan-sql-scripts</module> - <module>xplan-schemas</module> + <module>xplan-database-docker</module> <module>xplan-database-scripts</module> </modules> diff --git a/xplan-resources/xplan-sql-scripts/Dockerfile b/xplan-database/xplan-database-docker/Dockerfile similarity index 100% rename from xplan-resources/xplan-sql-scripts/Dockerfile rename to xplan-database/xplan-database-docker/Dockerfile diff --git a/xplan-resources/xplan-sql-scripts/README.md b/xplan-database/xplan-database-docker/README.md similarity index 100% rename from xplan-resources/xplan-sql-scripts/README.md rename to xplan-database/xplan-database-docker/README.md diff --git a/xplan-resources/xplan-sql-scripts/pom.xml b/xplan-database/xplan-database-docker/pom.xml similarity index 93% rename from xplan-resources/xplan-sql-scripts/pom.xml rename to xplan-database/xplan-database-docker/pom.xml index f40b7f6145dcbbd146868677c801ac1da25c724c..067f71373a3c1a06cc7cf2fe671a2b4fed53e1a7 100644 --- a/xplan-resources/xplan-sql-scripts/pom.xml +++ b/xplan-database/xplan-database-docker/pom.xml @@ -1,13 +1,13 @@ <?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-sql-scripts</artifactId> + <artifactId>xplan-database-docker</artifactId> <packaging>pom</packaging> <description>SQL Skripte zum Aufsetzen der Datenhaltung.</description> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-resources</artifactId> + <artifactId>xplan-database</artifactId> <version>7.2-SNAPSHOT</version> </parent> diff --git a/xplan-resources/xplan-sql-scripts/setup_db.sh b/xplan-database/xplan-database-docker/setup_db.sh similarity index 100% rename from xplan-resources/xplan-sql-scripts/setup_db.sh rename to xplan-database/xplan-database-docker/setup_db.sh diff --git a/xplan-resources/xplan-database-scripts/src/main/assembly/assembly.xml b/xplan-database/xplan-database-docker/src/main/assembly/assembly.xml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/assembly/assembly.xml rename to xplan-database/xplan-database-docker/src/main/assembly/assembly.xml diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan40/create.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan40/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan40/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan40/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan40/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan40/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan40/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan40/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan41/create.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan41/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan41/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan41/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan41/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan41/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan41/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan41/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan50/create.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan50/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan50/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan50/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan50/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan50/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan50/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan50/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan51/create.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan51/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan51/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan51/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan51/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan51/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan51/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan51/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan52/create.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan52/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan52/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan52/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan52/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan52/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan52/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan52/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan53/create.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan53/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan53/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan53/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan53/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan53/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan53/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan53/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan54/create.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan54/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan54/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan54/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan54/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan54/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan54/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan54/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan60/create.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan60/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan60/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan60/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan60/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplan60/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplan60/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplan60/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplansyn/create.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplansyn/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplansyn/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplansyn/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplansyn/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/archive/xplansyn/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/archive/xplansyn/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/archive/xplansyn/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/changelog/databasechangelog_v60.sql b/xplan-database/xplan-database-docker/src/main/resources/changelog/databasechangelog_v60.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/changelog/databasechangelog_v60.sql rename to xplan-database/xplan-database-docker/src/main/resources/changelog/databasechangelog_v60.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/create.sql b/xplan-database/xplan-database-docker/src/main/resources/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/extensions/dropTriggerUpdateGetAttachmentReference.sql b/xplan-database/xplan-database-docker/src/main/resources/extensions/dropTriggerUpdateGetAttachmentReference.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/extensions/dropTriggerUpdateGetAttachmentReference.sql rename to xplan-database/xplan-database-docker/src/main/resources/extensions/dropTriggerUpdateGetAttachmentReference.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/extensions/triggerUpdateGetAttachmentReference.sql b/xplan-database/xplan-database-docker/src/main/resources/extensions/triggerUpdateGetAttachmentReference.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/extensions/triggerUpdateGetAttachmentReference.sql rename to xplan-database/xplan-database-docker/src/main/resources/extensions/triggerUpdateGetAttachmentReference.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/extensions/updateAllGetAttachmentReferences.sql b/xplan-database/xplan-database-docker/src/main/resources/extensions/updateAllGetAttachmentReferences.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/extensions/updateAllGetAttachmentReferences.sql rename to xplan-database/xplan-database-docker/src/main/resources/extensions/updateAllGetAttachmentReferences.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan40/create.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan40/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan40/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan40/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan40/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan40/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan40/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan40/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan41/create.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan41/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan41/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan41/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan41/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan41/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan41/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan41/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan50/create.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan50/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan50/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan50/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan50/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan50/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan50/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan50/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan51/create.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan51/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan51/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan51/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan51/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan51/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan51/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan51/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan52/create.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan52/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan52/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan52/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan52/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan52/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan52/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan52/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan53/create.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan53/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan53/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan53/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan53/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan53/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan53/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan53/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan54/create.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan54/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan54/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan54/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan54/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan54/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan54/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan54/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan60/create.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan60/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan60/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan60/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan60/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplan60/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplan60/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplan60/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplansyn/create.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplansyn/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplansyn/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplansyn/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplansyn/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/fix/xplansyn/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/fix/xplansyn/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/fix/xplansyn/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/inspireplu/01_create_inspireplu_schema.sql b/xplan-database/xplan-database-docker/src/main/resources/inspireplu/01_create_inspireplu_schema.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/inspireplu/01_create_inspireplu_schema.sql rename to xplan-database/xplan-database-docker/src/main/resources/inspireplu/01_create_inspireplu_schema.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/inspireplu/02_create_inspireplu_view.sql b/xplan-database/xplan-database-docker/src/main/resources/inspireplu/02_create_inspireplu_view.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/inspireplu/02_create_inspireplu_view.sql rename to xplan-database/xplan-database-docker/src/main/resources/inspireplu/02_create_inspireplu_view.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan40/create.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan40/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan40/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan40/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan40/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan40/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan40/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan40/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan41/create.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan41/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan41/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan41/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan41/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan41/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan41/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan41/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan50/create.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan50/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan50/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan50/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan50/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan50/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan50/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan50/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan51/create.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan51/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan51/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan51/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan51/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan51/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan51/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan51/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan52/create.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan52/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan52/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan52/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan52/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan52/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan52/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan52/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan53/create.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan53/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan53/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan53/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan53/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan53/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan53/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan53/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan54/create.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan54/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan54/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan54/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan54/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan54/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan54/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan54/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan60/create.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan60/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan60/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan60/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan60/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplan60/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplan60/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplan60/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplansyn/create.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplansyn/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplansyn/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplansyn/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplansyn/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/pre/xplansyn/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/pre/xplansyn/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/pre/xplansyn/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/update/from_5.0.2_to_6.0/migrate.sql b/xplan-database/xplan-database-docker/src/main/resources/update/from_5.0.2_to_6.0/migrate.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/update/from_5.0.2_to_6.0/migrate.sql rename to xplan-database/xplan-database-docker/src/main/resources/update/from_5.0.2_to_6.0/migrate.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/update/from_5.0_to_5.0.2/01_addBereichTable.sql b/xplan-database/xplan-database-docker/src/main/resources/update/from_5.0_to_5.0.2/01_addBereichTable.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/update/from_5.0_to_5.0.2/01_addBereichTable.sql rename to xplan-database/xplan-database-docker/src/main/resources/update/from_5.0_to_5.0.2/01_addBereichTable.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/update/from_6.0.1_to_7.0/migrate.sql b/xplan-database/xplan-database-docker/src/main/resources/update/from_6.0.1_to_7.0/migrate.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/update/from_6.0.1_to_7.0/migrate.sql rename to xplan-database/xplan-database-docker/src/main/resources/update/from_6.0.1_to_7.0/migrate.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/update/from_6.0.1_to_7.0/migrate_25832.sql b/xplan-database/xplan-database-docker/src/main/resources/update/from_6.0.1_to_7.0/migrate_25832.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/update/from_6.0.1_to_7.0/migrate_25832.sql rename to xplan-database/xplan-database-docker/src/main/resources/update/from_6.0.1_to_7.0/migrate_25832.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/update/from_6.0_to_6.0.1/migrate.sql b/xplan-database/xplan-database-docker/src/main/resources/update/from_6.0_to_6.0.1/migrate.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/update/from_6.0_to_6.0.1/migrate.sql rename to xplan-database/xplan-database-docker/src/main/resources/update/from_6.0_to_6.0.1/migrate.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/update/from_7.0_to_7.1/migrate.sql b/xplan-database/xplan-database-docker/src/main/resources/update/from_7.0_to_7.1/migrate.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/update/from_7.0_to_7.1/migrate.sql rename to xplan-database/xplan-database-docker/src/main/resources/update/from_7.0_to_7.1/migrate.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/xplanmgr/create.sql b/xplan-database/xplan-database-docker/src/main/resources/xplanmgr/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/xplanmgr/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/xplanmgr/create.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/xplanmgr/drop.sql b/xplan-database/xplan-database-docker/src/main/resources/xplanmgr/drop.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/xplanmgr/drop.sql rename to xplan-database/xplan-database-docker/src/main/resources/xplanmgr/drop.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/xplanmgr/planslog.sql b/xplan-database/xplan-database-docker/src/main/resources/xplanmgr/planslog.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/xplanmgr/planslog.sql rename to xplan-database/xplan-database-docker/src/main/resources/xplanmgr/planslog.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/01_create_xplanvalidator_schema.sql b/xplan-database/xplan-database-docker/src/main/resources/xplanvalidator/01_create_xplanvalidator_schema.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/01_create_xplanvalidator_schema.sql rename to xplan-database/xplan-database-docker/src/main/resources/xplanvalidator/01_create_xplanvalidator_schema.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/03_create_plansAndFeatures.sql b/xplan-database/xplan-database-docker/src/main/resources/xplanvalidator/03_create_plansAndFeatures.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/03_create_plansAndFeatures.sql rename to xplan-database/xplan-database-docker/src/main/resources/xplanvalidator/03_create_plansAndFeatures.sql diff --git a/xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/create.sql b/xplan-database/xplan-database-docker/src/main/resources/xplanvalidator/create.sql similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/resources/xplanvalidator/create.sql rename to xplan-database/xplan-database-docker/src/main/resources/xplanvalidator/create.sql diff --git a/xplan-resources/xplan-database-scripts/Dockerfile b/xplan-database/xplan-database-scripts/Dockerfile similarity index 100% rename from xplan-resources/xplan-database-scripts/Dockerfile rename to xplan-database/xplan-database-scripts/Dockerfile diff --git a/xplan-resources/xplan-database-scripts/LICENSE_UNKNOWN.txt b/xplan-database/xplan-database-scripts/LICENSE_UNKNOWN.txt similarity index 100% rename from xplan-resources/xplan-database-scripts/LICENSE_UNKNOWN.txt rename to xplan-database/xplan-database-scripts/LICENSE_UNKNOWN.txt diff --git a/xplan-resources/xplan-database-scripts/README.md b/xplan-database/xplan-database-scripts/README.md similarity index 100% rename from xplan-resources/xplan-database-scripts/README.md rename to xplan-database/xplan-database-scripts/README.md diff --git a/xplan-resources/xplan-database-scripts/pom.xml b/xplan-database/xplan-database-scripts/pom.xml similarity index 99% rename from xplan-resources/xplan-database-scripts/pom.xml rename to xplan-database/xplan-database-scripts/pom.xml index 051ee0c7d39b5c641a5325a1d8db877d22c3880c..5d7df815811293962f6876eab18ae83dd0cb4c30 100644 --- a/xplan-resources/xplan-database-scripts/pom.xml +++ b/xplan-database/xplan-database-scripts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-resources</artifactId> + <artifactId>xplan-database</artifactId> <version>7.2-SNAPSHOT</version> </parent> diff --git a/xplan-resources/xplan-sql-scripts/src/main/assembly/assembly.xml b/xplan-database/xplan-database-scripts/src/main/assembly/assembly.xml similarity index 100% rename from xplan-resources/xplan-sql-scripts/src/main/assembly/assembly.xml rename to xplan-database/xplan-database-scripts/src/main/assembly/assembly.xml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0.1/changelog_v601.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0.1/changelog_v601.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0.1/changelog_v601.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0.1/changelog_v601.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0.1/changelog_xplansyn.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0.1/changelog_xplansyn.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0.1/changelog_xplansyn.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0.1/changelog_xplansyn.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0.1/changelog_xplansynarchive.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0.1/changelog_xplansynarchive.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0.1/changelog_xplansynarchive.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0.1/changelog_xplansynarchive.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0.1/changelog_xplansynpre.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0.1/changelog_xplansynpre.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0.1/changelog_xplansynpre.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0.1/changelog_xplansynpre.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_schemas.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_schemas.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_schemas.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_schemas.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_v60.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_v60.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_v60.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_v60.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan40.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan40.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan40.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan40.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan40archive.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan40archive.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan40archive.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan40archive.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan40pre.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan40pre.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan40pre.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan40pre.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan41.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan41.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan41.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan41.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan41archive.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan41archive.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan41archive.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan41archive.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan41pre.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan41pre.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan41pre.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan41pre.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan50.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan50.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan50.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan50.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan50archive.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan50archive.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan50archive.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan50archive.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan50pre.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan50pre.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan50pre.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan50pre.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan51.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan51.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan51.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan51.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan51archive.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan51archive.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan51archive.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan51archive.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan51pre.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan51pre.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan51pre.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan51pre.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan52.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan52.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan52.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan52.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan52archive.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan52archive.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan52archive.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan52archive.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan52pre.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan52pre.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan52pre.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan52pre.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan53.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan53.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan53.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan53.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan53archive.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan53archive.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan53archive.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan53archive.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan53pre.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan53pre.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan53pre.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan53pre.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan54.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan54.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan54.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan54.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan54archive.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan54archive.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan54archive.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan54archive.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan54pre.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan54pre.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan54pre.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan54pre.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan60.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan60.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan60.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan60.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan60archive.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan60archive.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan60archive.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan60archive.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan60pre.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan60pre.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplan60pre.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplan60pre.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplanmgr.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplanmgr.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplanmgr.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplanmgr.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplansyn.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplansyn.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplansyn.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplansyn.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplansynarchive.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplansynarchive.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplansynarchive.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplansynarchive.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplansynpre.yaml b/xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplansynpre.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/6.0/changelog_xplansynpre.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/6.0/changelog_xplansynpre.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_grant_privileges.yaml b/xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_grant_privileges.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_grant_privileges.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_grant_privileges.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_inspireplu.yaml b/xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_inspireplu.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_inspireplu.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_inspireplu.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_schemas.yaml b/xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_schemas.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_schemas.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_schemas.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_srid.yaml b/xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_srid.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_srid.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_srid.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_v70.yaml b/xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_v70.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_v70.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_v70.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_xplanmgr.yaml b/xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_xplanmgr.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_xplanmgr.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_xplanmgr.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_xplanvalidator.yaml b/xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_xplanvalidator.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/7.0/changelog_xplanvalidator.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/7.0/changelog_xplanvalidator.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/7.1/changelog_v71.yaml b/xplan-database/xplan-database-scripts/src/main/resources/7.1/changelog_v71.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/7.1/changelog_v71.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/7.1/changelog_v71.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/7.1/changelog_xplanvalidator.yaml b/xplan-database/xplan-database-scripts/src/main/resources/7.1/changelog_xplanvalidator.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/7.1/changelog_xplanvalidator.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/7.1/changelog_xplanvalidator.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/changelog_xplandb.yaml b/xplan-database/xplan-database-scripts/src/main/resources/changelog_xplandb.yaml similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/changelog_xplandb.yaml rename to xplan-database/xplan-database-scripts/src/main/resources/changelog_xplandb.yaml diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/liquibase-diff.properties b/xplan-database/xplan-database-scripts/src/main/resources/liquibase-diff.properties similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/liquibase-diff.properties rename to xplan-database/xplan-database-scripts/src/main/resources/liquibase-diff.properties diff --git a/xplan-resources/xplan-database-scripts/src/main/resources/liquibase.properties b/xplan-database/xplan-database-scripts/src/main/resources/liquibase.properties similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/resources/liquibase.properties rename to xplan-database/xplan-database-scripts/src/main/resources/liquibase.properties diff --git a/xplan-resources/xplan-database-scripts/src/main/scripts/createDatabaseDiff.sh b/xplan-database/xplan-database-scripts/src/main/scripts/createDatabaseDiff.sh similarity index 100% rename from xplan-resources/xplan-database-scripts/src/main/scripts/createDatabaseDiff.sh rename to xplan-database/xplan-database-scripts/src/main/scripts/createDatabaseDiff.sh diff --git a/xplan-resources/xplan-database-scripts/src/test/java/de/latlon/xplanbox/liquibase/LiquibaseConfigurationIT.java b/xplan-database/xplan-database-scripts/src/test/java/de/latlon/xplanbox/liquibase/LiquibaseConfigurationIT.java similarity index 100% rename from xplan-resources/xplan-database-scripts/src/test/java/de/latlon/xplanbox/liquibase/LiquibaseConfigurationIT.java rename to xplan-database/xplan-database-scripts/src/test/java/de/latlon/xplanbox/liquibase/LiquibaseConfigurationIT.java diff --git a/xplan-resources/xplan-database-scripts/src/test/resources/liquibase-target.properties b/xplan-database/xplan-database-scripts/src/test/resources/liquibase-target.properties similarity index 100% rename from xplan-resources/xplan-database-scripts/src/test/resources/liquibase-target.properties rename to xplan-database/xplan-database-scripts/src/test/resources/liquibase-target.properties diff --git a/xplan-distribution/pom.xml b/xplan-distribution/pom.xml index 659911e963a2e832975eb503d7e2370688f99410..a9ad95f26d45a680cbd3894d3413a3a9e302dd32 100644 --- a/xplan-distribution/pom.xml +++ b/xplan-distribution/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>xplan-distribution</artifactId> <packaging>pom</packaging> - <description>Modul zur Distributierung der xPlanBox</description> + <description>Distributionsmodul der xPlanBox</description> <parent> <groupId>de.latlon.product.xplanbox</groupId> @@ -36,8 +36,7 @@ </build> <dependencies> - <!-- Dokumentation --> - <!-- mkdir doc --> + <!-- Dokumentation > /doc --> <dependency> <groupId>${project.groupId}</groupId> <artifactId>xplan-benutzerhandbuch</artifactId> @@ -66,8 +65,7 @@ <classifier>pdf</classifier> <type>zip</type> </dependency> - <!-- CLI --> - <!-- mkdir bin --> + <!-- CLI > /bin --> <dependency> <groupId>${project.groupId}</groupId> <artifactId>xplan-manager-cli</artifactId> @@ -104,8 +102,7 @@ <version>${project.version}</version> <type>zip</type> </dependency> - <!-- Webapps and Webservices --> - <!-- mkdir web --> + <!-- Webapps and Webservices > /web --> <dependency> <groupId>${project.groupId}</groupId> <artifactId>xplan-manager-web</artifactId> @@ -114,13 +111,13 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-api-manager</artifactId> + <artifactId>xplan-manager-api</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-root</artifactId> + <artifactId>xplan-webpages</artifactId> <version>${project.version}</version> <classifier>default</classifier> <type>war</type> @@ -133,48 +130,47 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-api-validator</artifactId> + <artifactId>xplan-validator-api</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-api-dokumente</artifactId> + <artifactId>xplan-dokumente-api</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplansyn-wfs</artifactId> + <artifactId>xplan-services-wfs-syn</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-wfs</artifactId> + <artifactId>xplan-services-wfs</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-wms</artifactId> + <artifactId>xplan-services-wms</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-inspireplu</artifactId> + <artifactId>xplan-webservices-inspireplu</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-validator-wms</artifactId> + <artifactId>xplan-webservices-validator-wms</artifactId> <version>${project.version}</version> <type>war</type> </dependency> - <!-- Config --> - <!-- mkdir conf --> + <!-- Config > /conf --> <dependency> <groupId>${project.groupId}</groupId> <artifactId>xplan-manager-config</artifactId> @@ -190,7 +186,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-dokumenten-config</artifactId> + <artifactId>xplan-dokumente-config</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> @@ -208,62 +204,60 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> <classifier>xplan-manager-workspace</classifier> <type>zip</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> - <classifier>xplansyn-wfs-workspace</classifier> + <classifier>xplan-services-wfs-syn-workspace</classifier> <type>zip</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> - <classifier>xplansyn-wms-workspace</classifier> + <classifier>xplan-services-wms-workspace</classifier> <type>zip</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> - <classifier>xplan-wfs-workspace</classifier> + <classifier>xplan-services-wfs-workspace</classifier> <type>zip</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> - <classifier>xplan-inspireplu-workspace</classifier> + <classifier>xplan-webservices-inspireplu-workspace</classifier> <type>zip</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> - <classifier>xplan-validator-wms-memory-workspace</classifier> + <classifier>xplan-webservices-validator-wms-memory-workspace</classifier> <type>zip</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> - <classifier>xplan-validator-wms-sql-workspace</classifier> + <classifier>xplan-webservices-validator-wms-sql-workspace</classifier> <type>zip</type> </dependency> - <!-- Test --> - <!-- mkdir test --> + <!-- Test > /test --> <dependency> <groupId>${project.groupId}</groupId> <artifactId>xplan-tests-soapui</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> - </dependencies> </project> \ No newline at end of file diff --git a/xplan-distribution/src/main/assembly/assembly.xml b/xplan-distribution/src/main/assembly/assembly.xml index 396181b3e2eaf946ec1a29050d379b65f272382b..d7509f587673e209da4425719493294dfe860971 100644 --- a/xplan-distribution/src/main/assembly/assembly.xml +++ b/xplan-distribution/src/main/assembly/assembly.xml @@ -56,16 +56,16 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> <include>de.latlon.product.xplanbox:xplan-manager-web:war:*</include> - <include>de.latlon.product.xplanbox:xplan-api-manager:war:*</include> - <include>de.latlon.product.xplanbox:xplan-root:war:*</include> + <include>de.latlon.product.xplanbox:xplan-manager-api:war:*</include> + <include>de.latlon.product.xplanbox:xplan-webpages:war:*</include> <include>de.latlon.product.xplanbox:xplan-validator-web:war:*</include> - <include>de.latlon.product.xplanbox:xplan-api-validator:war:*</include> - <include>de.latlon.product.xplanbox:xplan-api-dokumente:war:*</include> - <include>de.latlon.product.xplanbox:xplansyn-wfs:war:*</include> - <include>de.latlon.product.xplanbox:xplan-wfs:war:*</include> - <include>de.latlon.product.xplanbox:xplan-wms:war:*</include> - <include>de.latlon.product.xplanbox:xplan-inspireplu:war:*</include> - <include>de.latlon.product.xplanbox:xplan-validator-wms:war:*</include> + <include>de.latlon.product.xplanbox:xplan-validator-api:war:*</include> + <include>de.latlon.product.xplanbox:xplan-dokumente-api:war:*</include> + <include>de.latlon.product.xplanbox:xplan-services-wfs-syn:war:*</include> + <include>de.latlon.product.xplanbox:xplan-services-wfs:war:*</include> + <include>de.latlon.product.xplanbox:xplan-services-wms:war:*</include> + <include>de.latlon.product.xplanbox:xplan-webservices-inspireplu:war:*</include> + <include>de.latlon.product.xplanbox:xplan-webservices-validator-wms:war:*</include> </includes> </dependencySet> <dependencySet> @@ -75,10 +75,17 @@ <includes> <include>de.latlon.product.xplanbox:xplan-manager-config:zip:*</include> <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-dokumente-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> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>conf</outputDirectory> + <outputFileNameMapping>${artifact.classifier}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>de.latlon.product.xplanbox:xplan-webservices-workspaces:zip:*</include> </includes> </dependencySet> <dependencySet> diff --git a/xplan-docker/pom.xml b/xplan-docker/pom.xml index b197f5a9a7f2e25baf2d38b3ee3301775d35fa62..386716f01021c2f0a81e82c24bb873191d4ba91f 100644 --- a/xplan-docker/pom.xml +++ b/xplan-docker/pom.xml @@ -12,8 +12,6 @@ </parent> <modules> - <module>xplan-docker-mapproxy</module> - <module>xplan-docker-mapserver</module> <module>xplan-docker-tomcat</module> <module>xplan-docker-tomcat-gdal</module> <module>xplan-docker-volume-init</module> diff --git a/xplan-docker/xplan-docker-volume-init/Dockerfile b/xplan-docker/xplan-docker-volume-init/Dockerfile index acd974f0b4719181d7dd49bc39f75e237ecd3b59..16fca34566039eea146fb67ec99fde38c9dbb5f7 100644 --- a/xplan-docker/xplan-docker-volume-init/Dockerfile +++ b/xplan-docker/xplan-docker-volume-init/Dockerfile @@ -24,7 +24,7 @@ ADD target/xplan-docker-volume-init-*.tgz /xplan-volume-init/ ADD setupVolumes.sh /xplan-volume-init/ ADD synthesizer /xplan-volume-init/synthesizer/ -COPY src/main/resources/xplan-inspireplu-workspaces/webapps.properties /xplan-volume-init/xplan-inspirepluvalidator-workspaces/ +COPY src/main/resources/xplan-inspireplu-workspaces/webapps.properties /xplan-volume-init/xplan-inspireplu-workspaces/ COPY src/main/resources/xplan-validator-workspaces/webapps.properties /xplan-volume-init/xplan-validator-workspaces/ COPY src/main/resources/xplan-workspaces/webapps.properties /xplan-volume-init/xplan-workspaces/ diff --git a/xplan-docker/xplan-docker-volume-init/pom.xml b/xplan-docker/xplan-docker-volume-init/pom.xml index 3b2356af0ca252e08ee960b7d9faeacc3005308e..8337e34cb53ab5bc4c7108ca68582446eced090e 100644 --- a/xplan-docker/xplan-docker-volume-init/pom.xml +++ b/xplan-docker/xplan-docker-volume-init/pom.xml @@ -39,52 +39,52 @@ </build> <dependencies> - <!--xplan-workspaces--> + <!--xplan-webservices-workspaces--> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> <type>zip</type> - <classifier>xplansyn-wms-workspace</classifier> + <classifier>xplan-services-wms-workspace</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> <type>zip</type> - <classifier>xplansyn-wfs-workspace</classifier> + <classifier>xplan-services-wfs-syn-workspace</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> <type>zip</type> - <classifier>xplan-wfs-workspace</classifier> + <classifier>xplan-services-wfs-workspace</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> <type>zip</type> - <classifier>xplan-validator-wms-memory-workspace</classifier> + <classifier>xplan-webservices-validator-wms-memory-workspace</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> <type>zip</type> - <classifier>xplan-validator-wms-sql-workspace</classifier> + <classifier>xplan-webservices-validator-wms-sql-workspace</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> <type>zip</type> <classifier>xplan-manager-workspace</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> <type>zip</type> <classifier>xplan-validator-workspace</classifier> @@ -104,20 +104,20 @@ <version>${project.version}</version> <type>zip</type> </dependency> - <!--xplan-dokumenten-config--> + <!--xplan-dokumente-config--> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-dokumenten-config</artifactId> + <artifactId>xplan-dokumente-config</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <!--xplan-inspireplu-workspaces--> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <version>${project.version}</version> <type>zip</type> - <classifier>xplan-inspireplu-workspace</classifier> + <classifier>xplan-webservices-inspireplu-workspace</classifier> </dependency> </dependencies> </project> diff --git a/xplan-docker/xplan-docker-volume-init/setupVolumes.sh b/xplan-docker/xplan-docker-volume-init/setupVolumes.sh index 8bd75748f65e4a959e7b69e183413946d676eb4b..5dcb23e90817301c235e8f8749aaffd103bdfafb 100755 --- a/xplan-docker/xplan-docker-volume-init/setupVolumes.sh +++ b/xplan-docker/xplan-docker-volume-init/setupVolumes.sh @@ -46,9 +46,9 @@ chmod -R a+w $XPLANBOX_VOLUMES XPLAN_WMS_URL_PUBLIC="${XPLAN_WMS_URL_PUBLIC:-tobedefined}" XPLAN_VALIDATORWMS_URL_PUBLIC="${XPLAN_VALIDATORWMS_URL_PUBLIC:-tobedefined}" -XPLAN_MANAGERAPI_URL_PUBLIC=${XPLAN_MANAGERAPI_URL_PUBLIC:-xplan-api-manager} -XPLAN_VALIDATORAPI_URL_PUBLIC=${XPLAN_VALIDATORAPI_URL_PUBLIC:-xplan-api-validator} -XPLAN_DOCUMENTENAPI_URL_PUBLIC=${XPLAN_DOCUMENTENAPI_URL_PUBLIC:-xplan-api-dokumente} +XPLAN_MANAGERAPI_URL_PUBLIC=${XPLAN_MANAGERAPI_URL_PUBLIC:-xplan-manager-api} +XPLAN_VALIDATORAPI_URL_PUBLIC=${XPLAN_VALIDATORAPI_URL_PUBLIC:-xplan-validator-api} +XPLAN_DOCUMENTENAPI_URL_PUBLIC=${XPLAN_DOCUMENTENAPI_URL_PUBLIC:-xplan-dokumente-api} XPLAN_MAPSERVER_URL_INTERNAL="${XPLAN_MAPSERVER_URL_INTERNAL:-http://xplan-mapserver}" XPLAN_SERVICES_URL_INTERNAL=${XPLAN_SERVICES_URL_INTERNAL:-http://xplan-services} XPLAN_SERVICES_API_KEY=${XPLAN_SERVICES_API_KEY:-xplanbox} @@ -125,26 +125,26 @@ sed -i 's|localhost:5432/xplanbox|'$XPLAN_DB'|g' xplan-workspaces/xplan-manager- sed -i 's|name="username" value="xplanbox"|name="username" value="'$XPLAN_DB_USER'"|g' xplan-workspaces/xplan-manager-workspace/jdbc/inspireplucp.xml sed -i 's|name="password" value="xplanbox"|name="password" value="'$XPLAN_DB_PASSWORD'"|g' xplan-workspaces/xplan-manager-workspace/jdbc/inspireplucp.xml -sed -i 's|http://localhost:8080/xplan-wms|'$XPLAN_WMS_URL_PUBLIC'/xplan-wms|g' xplan-workspaces/xplansyn-wms-workspace/services/html.gfi +sed -i 's|http://localhost:8080/xplan-wms|'$XPLAN_WMS_URL_PUBLIC'/xplan-wms|g' xplan-workspaces/xplan-services-wms-workspace/services/html.gfi -sed -i 's|localhost:5432/xplanbox|'$XPLAN_DB'|g' xplan-inspireplu-workspaces/xplan-inspireplu-workspace/jdbc/inspireplu.xml -sed -i 's|name="username" value="xplanbox"|name="username" value="'$XPLAN_DB_USER'"|g' xplan-inspireplu-workspaces/xplan-inspireplu-workspace/jdbc/inspireplu.xml -sed -i 's|name="password" value="xplanbox"|name="password" value="'$XPLAN_DB_PASSWORD'"|g' xplan-inspireplu-workspaces/xplan-inspireplu-workspace/jdbc/inspireplu.xml +sed -i 's|localhost:5432/xplanbox|'$XPLAN_DB'|g' xplan-inspireplu-workspaces/xplan-webservices-inspireplu-workspace/jdbc/inspireplu.xml +sed -i 's|name="username" value="xplanbox"|name="username" value="'$XPLAN_DB_USER'"|g' xplan-inspireplu-workspaces/xplan-webservices-inspireplu-workspace/jdbc/inspireplu.xml +sed -i 's|name="password" value="xplanbox"|name="password" value="'$XPLAN_DB_PASSWORD'"|g' xplan-inspireplu-workspaces/xplan-webservices-inspireplu-workspace/jdbc/inspireplu.xml echo "[$(date -Iseconds)] Configure XPlanServices StorageCRS with srid $XPLAN_SERVICES_DEFAULT_CRS_SRID" find xplan-workspaces/xplan-manager-workspace/datasources/feature -iname *.xml -exec sed -i 's|<StorageCRS srid="25832"|<StorageCRS srid="'$XPLAN_SERVICES_DEFAULT_CRS_SRID'"|g' {} \; -find xplan-workspaces/xplan-wfs-workspace/datasources/feature -iname *.xml -exec sed -i 's|<StorageCRS srid="25832"|<StorageCRS srid="'$XPLAN_SERVICES_DEFAULT_CRS_SRID'"|g' {} \; -find xplan-workspaces/xplansyn-wms-workspace/datasources/feature -iname *.xml -exec sed -i 's|<StorageCRS srid="25832"|<StorageCRS srid="'$XPLAN_SERVICES_DEFAULT_CRS_SRID'"|g' {} \; -find xplan-workspaces/xplansyn-wfs-workspace/datasources/feature -iname *.xml -exec sed -i 's|<StorageCRS srid="25832"|<StorageCRS srid="'$XPLAN_SERVICES_DEFAULT_CRS_SRID'"|g' {} \; +find xplan-workspaces/xplan-services-wfs-workspace/datasources/feature -iname *.xml -exec sed -i 's|<StorageCRS srid="25832"|<StorageCRS srid="'$XPLAN_SERVICES_DEFAULT_CRS_SRID'"|g' {} \; +find xplan-workspaces/xplan-services-wms-workspace/datasources/feature -iname *.xml -exec sed -i 's|<StorageCRS srid="25832"|<StorageCRS srid="'$XPLAN_SERVICES_DEFAULT_CRS_SRID'"|g' {} \; +find xplan-workspaces/xplan-services-wfs-syn-workspace/datasources/feature -iname *.xml -exec sed -i 's|<StorageCRS srid="25832"|<StorageCRS srid="'$XPLAN_SERVICES_DEFAULT_CRS_SRID'"|g' {} \; find xplan-workspaces/xplan-manager-workspace/datasources/feature -iname *.xml -exec sed -i 's|EPSG:25832</StorageCRS>|'$XPLAN_SERVICES_DEFAULT_CRS'</StorageCRS>|g' {} \; -find xplan-workspaces/xplan-wfs-workspace/datasources/feature -iname *.xml -exec sed -i 's|EPSG:25832</StorageCRS>|'$XPLAN_SERVICES_DEFAULT_CRS'</StorageCRS>|g' {} \; -find xplan-workspaces/xplansyn-wms-workspace/datasources/feature -iname *.xml -exec sed -i 's|EPSG:25832</StorageCRS>|'$XPLAN_SERVICES_DEFAULT_CRS'</StorageCRS>|g' {} \; -find xplan-workspaces/xplansyn-wfs-workspace/datasources/feature -iname *.xml -exec sed -i 's|EPSG:25832</StorageCRS>|'$XPLAN_SERVICES_DEFAULT_CRS'</StorageCRS>|g' {} \; +find xplan-workspaces/xplan-services-wfs-workspace/datasources/feature -iname *.xml -exec sed -i 's|EPSG:25832</StorageCRS>|'$XPLAN_SERVICES_DEFAULT_CRS'</StorageCRS>|g' {} \; +find xplan-workspaces/xplan-services-wms-workspace/datasources/feature -iname *.xml -exec sed -i 's|EPSG:25832</StorageCRS>|'$XPLAN_SERVICES_DEFAULT_CRS'</StorageCRS>|g' {} \; +find xplan-workspaces/xplan-services-wfs-syn-workspace/datasources/feature -iname *.xml -exec sed -i 's|EPSG:25832</StorageCRS>|'$XPLAN_SERVICES_DEFAULT_CRS'</StorageCRS>|g' {} \; echo "[$(date -Iseconds)] Configure XPlanWMS CRS" -find xplan-workspaces/xplansyn-wms-workspace/themes -iname *.xml -exec sed -i 's/<s:CRS>EPSG:25832 EPSG:25833 EPSG:31466 EPSG:31467 EPSG:31468 EPSG:31469 EPSG:4258 EPSG:4326 CRS:84 EPSG:4839<\/s:CRS>/<s:CRS>'"$XPLAN_SERVICES_DEFAULT_CRS $( echo ${XPLAN_SERVICES_QUERY_CRS_ARR[@]} )"'<\/s:CRS>/g' {} \; -find xplan-workspaces/xplansyn-wms-workspace/themes -iname *raster.xml -exec sed -i 's|<s:CRS>EPSG:25832</s:CRS>|<s:CRS>'$XPLAN_SERVICES_DEFAULT_CRS'</s:CRS>|g' {} \; +find xplan-workspaces/xplan-services-wms-workspace/themes -iname *.xml -exec sed -i 's/<s:CRS>EPSG:25832 EPSG:25833 EPSG:31466 EPSG:31467 EPSG:31468 EPSG:31469 EPSG:4258 EPSG:4326 CRS:84 EPSG:4839<\/s:CRS>/<s:CRS>'"$XPLAN_SERVICES_DEFAULT_CRS $( echo ${XPLAN_SERVICES_QUERY_CRS_ARR[@]} )"'<\/s:CRS>/g' {} \; +find xplan-workspaces/xplan-services-wms-workspace/themes -iname *raster.xml -exec sed -i 's|<s:CRS>EPSG:25832</s:CRS>|<s:CRS>'$XPLAN_SERVICES_DEFAULT_CRS'</s:CRS>|g' {} \; echo "[$(date -Iseconds)] Configure XPlanWFS QueryCRS" -find xplan-workspaces/xplan-wfs-workspace/services -iname wfs*.xml -not -iname *_metadata.xml -exec sed -i '/<QueryCRS>EPSG:.*<\/QueryCRS>/d' {} \; +find xplan-workspaces/xplan-services-wfs-workspace/services -iname wfs*.xml -not -iname *_metadata.xml -exec sed -i '/<QueryCRS>EPSG:.*<\/QueryCRS>/d' {} \; find xplan-workspaces/xplan*-workspace/services -iname *_metadata.xml -exec sed -i 's|<ProviderName>lat/lon GmbH</ProviderName>|<ProviderName>'"$XPLAN_SERVICES_PROVIDER_NAME"'</ProviderName>|g' {} \; find xplan-workspaces/xplan*-workspace/services -iname *_metadata.xml -exec sed -i 's|<ProviderSite>http://www.lat-lon.de</ProviderSite>|<ProviderSite>'"$XPLAN_SERVICES_PROVIDER_SITE"'</ProviderSite>|g' {} \; @@ -163,19 +163,19 @@ find xplan-workspaces/xplan*-workspace/services -iname *_metadata.xml -exec sed for crs in "${XPLAN_SERVICES_QUERY_CRS_ARR[@]}" do - find xplan-workspaces/xplan-wfs-workspace/services -iname wfs*.xml -not -iname *_metadata.xml -exec sed -i 's/<QueryCRS>CRS:84<\/QueryCRS>/<QueryCRS>CRS:84<\/QueryCRS><QueryCRS>'$crs'<\/QueryCRS>/g' {} \; + find xplan-workspaces/xplan-services-wfs-workspace/services -iname wfs*.xml -not -iname *_metadata.xml -exec sed -i 's/<QueryCRS>CRS:84<\/QueryCRS>/<QueryCRS>CRS:84<\/QueryCRS><QueryCRS>'$crs'<\/QueryCRS>/g' {} \; done -find xplan-workspaces/xplan-wfs-workspace/services -iname wfs*.xml -not -iname *_metadata.xml -exec sed -i 's/<QueryCRS>CRS:84<\/QueryCRS>/<QueryCRS>CRS:84<\/QueryCRS><QueryCRS>'$XPLAN_SERVICES_DEFAULT_CRS'<\/QueryCRS>/g' {} \; -find xplan-workspaces/xplan-wfs-workspace/services -iname wfs*.xml -not -iname *_metadata.xml -exec sed -i 's/<QueryCRS>CRS:84<\/QueryCRS>//g' {} \; +find xplan-workspaces/xplan-services-wfs-workspace/services -iname wfs*.xml -not -iname *_metadata.xml -exec sed -i 's/<QueryCRS>CRS:84<\/QueryCRS>/<QueryCRS>CRS:84<\/QueryCRS><QueryCRS>'$XPLAN_SERVICES_DEFAULT_CRS'<\/QueryCRS>/g' {} \; +find xplan-workspaces/xplan-services-wfs-workspace/services -iname wfs*.xml -not -iname *_metadata.xml -exec sed -i 's/<QueryCRS>CRS:84<\/QueryCRS>//g' {} \; echo "[$(date -Iseconds)] Configure XPlanSynWFS QueryCRS" -find xplan-workspaces/xplansyn-wfs-workspace/services -iname xplansynwfs*.xml -not -iname *_metadata.xml -exec sed -i '/<QueryCRS>EPSG:.*<\/QueryCRS>/d' {} \; +find xplan-workspaces/xplan-services-wfs-syn-workspace/services -iname xplansynwfs*.xml -not -iname *_metadata.xml -exec sed -i '/<QueryCRS>EPSG:.*<\/QueryCRS>/d' {} \; for crs in "${XPLAN_SERVICES_QUERY_CRS_ARR[@]}" do - find xplan-workspaces/xplansyn-wfs-workspace/services -iname xplansynwfs*.xml -not -iname *_metadata.xml -exec sed -i 's/<QueryCRS>CRS:84<\/QueryCRS>/<QueryCRS>CRS:84<\/QueryCRS><QueryCRS>'$crs'<\/QueryCRS>/g' {} \; + find xplan-workspaces/xplan-services-wfs-syn-workspace/services -iname xplansynwfs*.xml -not -iname *_metadata.xml -exec sed -i 's/<QueryCRS>CRS:84<\/QueryCRS>/<QueryCRS>CRS:84<\/QueryCRS><QueryCRS>'$crs'<\/QueryCRS>/g' {} \; done -find xplan-workspaces/xplansyn-wfs-workspace/services -iname xplansynwfs*.xml -not -iname *_metadata.xml -exec sed -i 's/<QueryCRS>CRS:84<\/QueryCRS>/<QueryCRS>CRS:84<\/QueryCRS><QueryCRS>'$XPLAN_SERVICES_DEFAULT_CRS'<\/QueryCRS>/g' {} \; -find xplan-workspaces/xplansyn-wfs-workspace/services -iname xplansynwfs*.xml -not -iname *_metadata.xml -exec sed -i 's/<QueryCRS>CRS:84<\/QueryCRS>//g' {} \; +find xplan-workspaces/xplan-services-wfs-syn-workspace/services -iname xplansynwfs*.xml -not -iname *_metadata.xml -exec sed -i 's/<QueryCRS>CRS:84<\/QueryCRS>/<QueryCRS>CRS:84<\/QueryCRS><QueryCRS>'$XPLAN_SERVICES_DEFAULT_CRS'<\/QueryCRS>/g' {} \; +find xplan-workspaces/xplan-services-wfs-syn-workspace/services -iname xplansynwfs*.xml -not -iname *_metadata.xml -exec sed -i 's/<QueryCRS>CRS:84<\/QueryCRS>//g' {} \; echo $XPLAN_SERVICES_API_KEY >> xplan-workspaces/config.apikey @@ -185,30 +185,30 @@ if [ $XPLAN_INIT_RASTERTYPE = "gdal" ] then echo "[$(date -Iseconds)] Configure rastertype gdal" sed -i 's/rasterConfigurationType=geotiff/rasterConfigurationType=gdal/g' xplan-manager-config/managerConfiguration.properties - mv xplan-workspaces/xplansyn-wms-workspace/gdal.ignore xplan-workspaces/xplansyn-wms-workspace/gdal.xml - mv xplan-workspaces/xplansyn-wms-workspace/datasources/tile/dummy.ignore xplan-workspaces/xplansyn-wms-workspace/datasources/tile/dummy.xml - mv xplan-workspaces/xplansyn-wms-workspace/datasources/tile/tilematrixset/dummy.ignore xplan-workspaces/xplansyn-wms-workspace/datasources/tile/tilematrixset/dummy.xml - mv xplan-workspaces/xplansyn-wms-workspace/layers/dummyrasterlayer.ignore xplan-workspaces/xplansyn-wms-workspace/layers/dummyrasterlayer.xml - find xplan-workspaces/xplansyn-wms-workspace/themes -iname *raster.xml -exec sed -i 's/<!--<LayerStoreId>dummyrasterlayer/<LayerStoreId>dummyrasterlayer/g' {} \; - find xplan-workspaces/xplansyn-wms-workspace/themes -iname *raster.xml -exec sed -i 's/dummyrasterlayer<\/LayerStoreId>-->/dummyrasterlayer<\/LayerStoreId>/g' {} \; + mv xplan-workspaces/xplan-services-wms-workspace/gdal.ignore xplan-workspaces/xplan-services-wms-workspace/gdal.xml + mv xplan-workspaces/xplan-services-wms-workspace/datasources/tile/dummy.ignore xplan-workspaces/xplan-services-wms-workspace/datasources/tile/dummy.xml + mv xplan-workspaces/xplan-services-wms-workspace/datasources/tile/tilematrixset/dummy.ignore xplan-workspaces/xplan-services-wms-workspace/datasources/tile/tilematrixset/dummy.xml + mv xplan-workspaces/xplan-services-wms-workspace/layers/dummyrasterlayer.ignore xplan-workspaces/xplan-services-wms-workspace/layers/dummyrasterlayer.xml + find xplan-workspaces/xplan-services-wms-workspace/themes -iname *raster.xml -exec sed -i 's/<!--<LayerStoreId>dummyrasterlayer/<LayerStoreId>dummyrasterlayer/g' {} \; + find xplan-workspaces/xplan-services-wms-workspace/themes -iname *raster.xml -exec sed -i 's/dummyrasterlayer<\/LayerStoreId>-->/dummyrasterlayer<\/LayerStoreId>/g' {} \; elif [ $XPLAN_INIT_RASTERTYPE = "geotiff" ] then echo "[$(date -Iseconds)] Configure rastertype geotiff" - rm xplan-workspaces/xplansyn-wms-workspace/datasources/tile/dummy.ignore - rm xplan-workspaces/xplansyn-wms-workspace/datasources/tile/tilematrixset/dummy.ignore - rm xplan-workspaces/xplansyn-wms-workspace/layers/dummyrasterlayer.ignore + rm xplan-workspaces/xplan-services-wms-workspace/datasources/tile/dummy.ignore + rm xplan-workspaces/xplan-services-wms-workspace/datasources/tile/tilematrixset/dummy.ignore + rm xplan-workspaces/xplan-services-wms-workspace/layers/dummyrasterlayer.ignore else echo "[$(date -Iseconds)] Configure rastertype mapserver" sed -i 's/rasterConfigurationType=geotiff/rasterConfigurationType=mapserver/g' xplan-manager-config/managerConfiguration.properties - mv xplan-workspaces/xplansyn-wms-workspace/layers/mapserver.ignore xplan-workspaces/xplansyn-wms-workspace/layers/mapserver.xml - mv xplan-workspaces/xplansyn-wms-workspace/datasources/remoteows/mapserver.ignore xplan-workspaces/xplansyn-wms-workspace/datasources/remoteows/mapserver.xml - find xplan-workspaces/xplansyn-wms-workspace/themes -iname *raster.xml -exec sed -i 's/<!--<LayerStoreId>mapserver/<LayerStoreId>mapserver/g' {} \; - find xplan-workspaces/xplansyn-wms-workspace/themes -iname *raster.xml -exec sed -i 's/mapserver<\/LayerStoreId>-->/mapserver<\/LayerStoreId>/g' {} \; - find xplan-workspaces/xplansyn-wms-workspace/themes -iname *raster.xml -exec sed -i 's/<!--<Layer layerStore="mapserver"/<Layer layerStore="mapserver"/g' {} \; - find xplan-workspaces/xplansyn-wms-workspace/themes -iname *raster.xml -exec sed -i 's/planrasterarchive<\/Layer>-->/planrasterarchive<\/Layer>/g' {} \; - find xplan-workspaces/xplansyn-wms-workspace/themes -iname *raster.xml -exec sed -i 's/planrasterpre<\/Layer>-->/planrasterpre<\/Layer>/g' {} \; - find xplan-workspaces/xplansyn-wms-workspace/themes -iname *raster.xml -exec sed -i 's/planraster<\/Layer>-->/planraster<\/Layer>/g' {} \; - sed -i 's|http://localhost:8080/mapserver|'$XPLAN_MAPSERVER_URL_INTERNAL'/mapserver|g' xplan-workspaces/xplansyn-wms-workspace/datasources/remoteows/mapserver.xml + mv xplan-workspaces/xplan-services-wms-workspace/layers/mapserver.ignore xplan-workspaces/xplan-services-wms-workspace/layers/mapserver.xml + mv xplan-workspaces/xplan-services-wms-workspace/datasources/remoteows/mapserver.ignore xplan-workspaces/xplan-services-wms-workspace/datasources/remoteows/mapserver.xml + find xplan-workspaces/xplan-services-wms-workspace/themes -iname *raster.xml -exec sed -i 's/<!--<LayerStoreId>mapserver/<LayerStoreId>mapserver/g' {} \; + find xplan-workspaces/xplan-services-wms-workspace/themes -iname *raster.xml -exec sed -i 's/mapserver<\/LayerStoreId>-->/mapserver<\/LayerStoreId>/g' {} \; + find xplan-workspaces/xplan-services-wms-workspace/themes -iname *raster.xml -exec sed -i 's/<!--<Layer layerStore="mapserver"/<Layer layerStore="mapserver"/g' {} \; + find xplan-workspaces/xplan-services-wms-workspace/themes -iname *raster.xml -exec sed -i 's/planrasterarchive<\/Layer>-->/planrasterarchive<\/Layer>/g' {} \; + find xplan-workspaces/xplan-services-wms-workspace/themes -iname *raster.xml -exec sed -i 's/planrasterpre<\/Layer>-->/planrasterpre<\/Layer>/g' {} \; + find xplan-workspaces/xplan-services-wms-workspace/themes -iname *raster.xml -exec sed -i 's/planraster<\/Layer>-->/planraster<\/Layer>/g' {} \; + sed -i 's|http://localhost:8080/mapserver|'$XPLAN_MAPSERVER_URL_INTERNAL'/mapserver|g' xplan-workspaces/xplan-services-wms-workspace/datasources/remoteows/mapserver.xml fi sed -i 's|validatorWmsEndpoint=|validatorWmsEndpoint='$XPLAN_VALIDATORWMS_URL_PUBLIC'\/xplan-validator-wms\/services\/wms|g' xplan-validator-config/validatorConfiguration.properties @@ -217,7 +217,7 @@ sed -i 's|validatorWmsEndpoint=|validatorWmsEndpoint='$XPLAN_VALIDATORWMS_URL_PU if [[ -z "${spring_profiles_active##*validatorwmssql*}" ]] then echo "[$(date -Iseconds)] Configure XPlanValidatorWMS with database" - sed -i 's|xplan-validator-wms-memory-workspace|xplan-validator-wms-sql-workspace|g' xplan-validator-workspaces/webapps.properties + sed -i 's|xplan-webservices-validator-wms-memory-workspace|xplan-webservices-validator-wms-sql-workspace|g' xplan-validator-workspaces/webapps.properties fi #copy example external codelist diff --git a/xplan-docker/xplan-docker-volume-init/src/assembly/xplan-docker-volumes.xml b/xplan-docker/xplan-docker-volume-init/src/assembly/xplan-docker-volumes.xml index 74307894256f1b4dc57cee030acd075a63d800c8..b8f532926018863fd719448e2c77915ff7a66a00 100644 --- a/xplan-docker/xplan-docker-volume-init/src/assembly/xplan-docker-volumes.xml +++ b/xplan-docker/xplan-docker-volume-init/src/assembly/xplan-docker-volumes.xml @@ -10,25 +10,25 @@ <dependencySets> <!--xplan-workspaces--> <dependencySet> - <outputDirectory>/xplan-workspaces/xplansyn-wms-workspace</outputDirectory> + <outputDirectory>/xplan-workspaces/xplan-services-wms-workspace</outputDirectory> <includes> - <include>${project.groupId}:xplan-workspaces::xplansyn-wms-workspace</include> + <include>${project.groupId}:xplan-webservices-workspaces::xplan-services-wms-workspace</include> </includes> <unpack>true</unpack> <useProjectArtifact>false</useProjectArtifact> </dependencySet> <dependencySet> - <outputDirectory>/xplan-workspaces/xplansyn-wfs-workspace</outputDirectory> + <outputDirectory>/xplan-workspaces/xplan-services-wfs-syn-workspace</outputDirectory> <includes> - <include>${project.groupId}:xplan-workspaces::xplansyn-wfs-workspace</include> + <include>${project.groupId}:xplan-webservices-workspaces::xplan-services-wfs-syn-workspace</include> </includes> <unpack>true</unpack> <useProjectArtifact>false</useProjectArtifact> </dependencySet> <dependencySet> - <outputDirectory>/xplan-workspaces/xplan-wfs-workspace</outputDirectory> + <outputDirectory>/xplan-workspaces/xplan-services-wfs-workspace</outputDirectory> <includes> - <include>${project.groupId}:xplan-workspaces::xplan-wfs-workspace</include> + <include>${project.groupId}:xplan-webservices-workspaces::xplan-services-wfs-workspace</include> </includes> <unpack>true</unpack> <useProjectArtifact>false</useProjectArtifact> @@ -36,7 +36,7 @@ <dependencySet> <outputDirectory>/xplan-workspaces/xplan-manager-workspace</outputDirectory> <includes> - <include>${project.groupId}:xplan-workspaces::xplan-manager-workspace</include> + <include>${project.groupId}:xplan-webservices-workspaces::xplan-manager-workspace</include> </includes> <unpack>true</unpack> <useProjectArtifact>false</useProjectArtifact> @@ -44,7 +44,7 @@ <dependencySet> <outputDirectory>/xplan-validator-workspaces/xplan-validator-workspace</outputDirectory> <includes> - <include>${project.groupId}:xplan-workspaces::xplan-validator-workspace</include> + <include>${project.groupId}:xplan-webservices-workspaces::xplan-validator-workspace</include> </includes> <unpack>true</unpack> <useProjectArtifact>false</useProjectArtifact> @@ -71,7 +71,7 @@ <dependencySet> <outputDirectory>/xplan-dokumenten-config</outputDirectory> <includes> - <include>${project.groupId}:xplan-dokumenten-config</include> + <include>${project.groupId}:xplan-dokumente-config</include> </includes> <unpack>true</unpack> <useProjectArtifact>false</useProjectArtifact> @@ -87,27 +87,27 @@ </dependencySet> <!--xplan-inspireplu-workspaces--> <dependencySet> - <outputDirectory>/xplan-inspireplu-workspaces/xplan-inspireplu-workspace</outputDirectory> + <outputDirectory>/xplan-inspireplu-workspaces/xplan-webservices-inspireplu-workspace</outputDirectory> <includes> - <include>${project.groupId}:xplan-workspaces::xplan-inspireplu-workspace</include> + <include>${project.groupId}:xplan-webservices-workspaces::xplan-webservices-inspireplu-workspace</include> </includes> <unpack>true</unpack> <useProjectArtifact>false</useProjectArtifact> </dependencySet> - <!-- xplan-validator-wms-memory-workspaces --> + <!-- xplan-webservices-validator-wms-memory-workspaces --> <dependencySet> - <outputDirectory>/xplan-validator-workspaces/xplan-validator-wms-memory-workspace</outputDirectory> + <outputDirectory>/xplan-validator-workspaces/xplan-webservices-validator-wms-memory-workspace</outputDirectory> <includes> - <include>${project.groupId}:xplan-workspaces::xplan-validator-wms-memory-workspace</include> + <include>${project.groupId}:xplan-webservices-workspaces::xplan-webservices-validator-wms-memory-workspace</include> </includes> <unpack>true</unpack> <useProjectArtifact>false</useProjectArtifact> </dependencySet> - <!-- xplan-validator-wms-sql-workspaces --> + <!-- xplan-webservices-validator-wms-sql-workspaces --> <dependencySet> - <outputDirectory>/xplan-validator-workspaces/xplan-validator-wms-sql-workspace</outputDirectory> + <outputDirectory>/xplan-validator-workspaces/xplan-webservices-validator-wms-sql-workspace</outputDirectory> <includes> - <include>${project.groupId}:xplan-workspaces::xplan-validator-wms-sql-workspace</include> + <include>${project.groupId}:xplan-webservices-workspaces::xplan-webservices-validator-wms-sql-workspace</include> </includes> <unpack>true</unpack> <useProjectArtifact>false</useProjectArtifact> diff --git a/xplan-docker/xplan-docker-volume-init/src/main/resources/xplan-inspireplu-workspaces/webapps.properties b/xplan-docker/xplan-docker-volume-init/src/main/resources/xplan-inspireplu-workspaces/webapps.properties index af5bd3194e5b04a6e13c7d8fed6dec52d77791ac..82b22abb8088f9932aab9444897d52db73d891cb 100644 --- a/xplan-docker/xplan-docker-volume-init/src/main/resources/xplan-inspireplu-workspaces/webapps.properties +++ b/xplan-docker/xplan-docker-volume-init/src/main/resources/xplan-inspireplu-workspaces/webapps.properties @@ -18,4 +18,4 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -/xplan-inspireplu=xplan-inspireplu-workspace +/xplan-inspireplu=xplan-webservices-inspireplu-workspace diff --git a/xplan-docker/xplan-docker-volume-init/src/main/resources/xplan-validator-workspaces/webapps.properties b/xplan-docker/xplan-docker-volume-init/src/main/resources/xplan-validator-workspaces/webapps.properties index a8dcf3e0f0bf32b86b813fd8255c712923a6cc21..cf3f91d40a7df315b7bd610910cf1e252b0638f6 100644 --- a/xplan-docker/xplan-docker-volume-init/src/main/resources/xplan-validator-workspaces/webapps.properties +++ b/xplan-docker/xplan-docker-volume-init/src/main/resources/xplan-validator-workspaces/webapps.properties @@ -18,4 +18,4 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -/xplan-validator-wms=xplan-validator-wms-memory-workspace +/xplan-validator-wms=xplan-webservices-validator-wms-memory-workspace diff --git a/xplan-docker/xplan-docker-volume-init/src/main/resources/xplan-workspaces/webapps.properties b/xplan-docker/xplan-docker-volume-init/src/main/resources/xplan-workspaces/webapps.properties index 4ad62458e02f374dd42933c9353c7090166affa0..49d7567bc9c78efccb01b2380f70c08646a4d2a6 100644 --- a/xplan-docker/xplan-docker-volume-init/src/main/resources/xplan-workspaces/webapps.properties +++ b/xplan-docker/xplan-docker-volume-init/src/main/resources/xplan-workspaces/webapps.properties @@ -18,6 +18,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -/xplan-wms=xplansyn-wms-workspace -/xplansyn-wfs=xplansyn-wfs-workspace -/xplan-wfs=xplan-wfs-workspace +/xplan-wms=xplan-services-wms-workspace +/xplansyn-wfs=xplan-services-wfs-syn-workspace +/xplan-wfs=xplan-services-wfs-workspace diff --git a/xplan-documentation/pom.xml b/xplan-documentation/pom.xml index 32f10e68960d6bdb96c523e8aa4c8a79e3954e43..4102ec90527a0a94105003ed761c77570e8de6c8 100644 --- a/xplan-documentation/pom.xml +++ b/xplan-documentation/pom.xml @@ -75,6 +75,7 @@ <modules> <module>xplan-benutzerhandbuch</module> + <module>xplan-webpages</module> </modules> <profiles> diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanDokumentenAPI.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanDokumentenAPI.adoc index db142bdd45a00a4e473dddbf236ff69d9713e98f..3ac6664f3d6cb00b00722b7cb1222e13f89eb050 100644 --- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanDokumentenAPI.adoc +++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanDokumentenAPI.adoc @@ -18,4 +18,4 @@ Die REST-API der Komponente XPlanDokumentenAPI stellt folgende Ressourcen bereit Eine vollständige Beschreibung der HTTP Status-Codes und der unterstützten Inhaltstypen (media types) und Formate (Encodings) für die jeweiligen Ressourcen sind in der OpenAPI-Schnittstellenbeschreibung enthalten. -NOTE: Die URL für die REST-API der Komponente XPlanDokumentenAPI setzt sich wie folgt zusammen: http://<host>:<port>/xplan-api-dokumente/xdokumente/api/v1/. Die URL für die xPlanBox-Demo lautet https://xplanbox.lat-lon.de/xdokumente/api/v1/. +NOTE: Die URL für die REST-API der Komponente XPlanDokumentenAPI setzt sich wie folgt zusammen: http://<host>:<port>/xplan-dokumente-api/xdokumente/api/v1/. Die URL für die xPlanBox-Demo lautet https://xplanbox.lat-lon.de/xdokumente/api/v1/. diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanInspirePluWFS.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanInspirePluWFS.adoc index 4fd589f1d402862de5cda937643c1a50d1495447..7d686d304680f9b3c9a1ed5c2463c3613cbdbfea 100644 --- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanInspirePluWFS.adoc +++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanInspirePluWFS.adoc @@ -20,7 +20,7 @@ Der XPlanInspirePluWFS ist ein INSPIRE Download Service (WFS 2.0) basierend auf ==== Adresse des Dienstes ---- -http://<host>:<port>/xplan-inspireplu/services/downloadservice? +http://<host>:<port>/xplan-webservices-inspireplu/services/downloadservice? ---- [[xplaninspirepluwfs-beispielanfragen]] @@ -31,21 +31,21 @@ http://<host>:<port>/xplan-inspireplu/services/downloadservice? ===== GetCapabilities ---- -http://<host>:<port>/xplan-inspireplu/services/downloadservice?request=GetCapabilities&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-webservices-inspireplu/services/downloadservice?request=GetCapabilities&Service=WFS&Version=2.0.0 ---- [[xplaninspirepluwfs-getfeature]] ===== GetFeature ---- -http://<host>:<port>/xplan-inspireplu/services/downloadservice?request=GetFeature&Service=WFS&Version=2.0.0&typename=plu:SpatialPlan +http://<host>:<port>/xplan-webservices-inspireplu/services/downloadservice?request=GetFeature&Service=WFS&Version=2.0.0&typename=plu:SpatialPlan ---- [[xplaninspirepluwfs-describefeaturetype]] ===== DescribeFeatureType ---- -http://<host>:<port>/xplan-inspireplu/services/downloadservice?request=DescribeFeatureType&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-webservices-inspireplu/services/downloadservice?request=DescribeFeatureType&Service=WFS&Version=2.0.0 ---- [[xplaninspirepluwfs-operationen]] diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanInspirePluWMS.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanInspirePluWMS.adoc index 6ad09e23cc323d163a788ba43e7bb064071c1213..10218546b37a37e38fe2b547621d8eca56eb39a8 100644 --- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanInspirePluWMS.adoc +++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanInspirePluWMS.adoc @@ -20,7 +20,7 @@ Der XPlanInspirePluWMS ist ein INSPIRE View Service basierend auf der Open Sourc ==== Adresse des Dienstes ---- -http://<host>:<port>/xplan-inspireplu/services/viewservice? +http://<host>:<port>/xplan-webservices-inspireplu/services/viewservice? ---- [[xplaninspirepluwms-beispielanfragen]] @@ -31,14 +31,14 @@ http://<host>:<port>/xplan-inspireplu/services/viewservice? ===== GetCapabilities ---- -http://<host>:<port>/xplan-inspireplu/services/viewservice?request=GetCapabilities&service=WMS&version=1.3.0 +http://<host>:<port>/xplan-webservices-inspireplu/services/viewservice?request=GetCapabilities&service=WMS&version=1.3.0 ---- [[xplaninspirepluwms-getmap]] ===== GetMap ---- -http://<host>:<port>//xplan-inspireplu/services/viewservice?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&BBOX=49.0,9.0,50.0,9.5&CRS=EPSG:4326&WIDTH=1000&HEIGHT=1000&LAYERS=LU.SpatialPlan&STYLES=&FORMAT=image/png&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE +http://<host>:<port>//xplan-webservices-inspireplu/services/viewservice?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&BBOX=49.0,9.0,50.0,9.5&CRS=EPSG:4326&WIDTH=1000&HEIGHT=1000&LAYERS=LU.SpatialPlan&STYLES=&FORMAT=image/png&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE ---- [[xplaninspirepluwms-operationen]] diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanManager_API.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanManager_API.adoc index faa945fec7d135b0bfd9bf9b55db0391c1c69f92..df436ffb64f3fb9deca2a1c2ab60dcc4c351a77c 100644 --- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanManager_API.adoc +++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanManager_API.adoc @@ -46,7 +46,7 @@ Neben dem Datenformat JSON unterstützt die REST-API auch andere Inhaltstypen, d Eine vollständige Beschreibung der HTTP Status-Codes und der unterstützten Inhaltstypen (media types) und Formate (Encodings) für die jeweiligen Ressourcen sind in der OpenAPI-Schnittstellenbeschreibung enthalten. -NOTE: Die URL für die REST-API des XPlanManager setzt sich wie folgt zusammen: http://<host>:<port>/xplan-api-manager/xmanager/api/v1/. Die URL für die xPlanBox-Demo lautet https://xplanbox.lat-lon.de/xmanager/api/v1/. +NOTE: Die URL für die REST-API des XPlanManager setzt sich wie folgt zusammen: http://<host>:<port>/xplan-manager-api/xmanager/api/v1/. Die URL für die xPlanBox-Demo lautet https://xplanbox.lat-lon.de/xmanager/api/v1/. IMPORTANT: Die alte REST-API mit den Ressourcen `/xplanmgrweb/rest/manager/plans` und `/xplanmgrweb/rest/manager/plan/{planId}` wird durch die neue API komplett ersetzt und in einer zukünftigen Version der xPlanBox entfernt! diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanManager_Web.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanManager_Web.adoc index ef83357a5e903707a331ec5fe290ed7a1f5bef96..4bc61668b337790cb9d98fda0c539c712b59757d 100644 --- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanManager_Web.adoc +++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanManager_Web.adoc @@ -16,7 +16,7 @@ http://<host>:<port>/xplan-manager-web/ ==== Funktionen des XPlanManagerWeb -Mit dem XPlanManagerWeb kann der Benutzer <<xplanarchiv, XPlanArchive>> und <<xplangmlfile, XPlanGML-Dateien>> in die Datenhaltung laden, diese editieren und löschen sowie bereits importiere Planwerke wieder exportieren. +Mit dem XPlanManagerWeb kann der Benutzer <<xplanarchiv,XPlanArchive>> und <<xplangmlfile,XPlanGML-Dateien>> in die Datenhaltung laden, diese editieren und löschen sowie bereits importiere Planwerke wieder exportieren. [[xplanmanager-web-hinzufuegen]] ===== Hinzufügen @@ -30,9 +30,9 @@ _Hinzufügen_ hochgeladen werden. Der Benutzer wird über den Abschluss des Vorg ===== Validieren Nachdem die Datei hochgeladen wurde, kann diese -validiert werden. Hier stehen die Auswahlmöglichkeiten des <<xplanvalidator-web-validieren, XPlanValidatorWeb>> zur Verfügung. +validiert werden. Hier stehen die Auswahlmöglichkeiten des <<xplanvalidator-web-validieren,XPlanValidatorWeb>> zur Verfügung. -IMPORTANT: Bei der Validierung werden die syntaktische und basisgeometrische Prüfung (s. Abschnitt <<xplanvalidator-web-geometrisch, geometrische Validierung>>) immer mit ausgeführt. Diese Prüfungen stellen sicher, dass ein Plan keine schwerwiegenden Fehler enthält, die einen Import verhindern. Um die automatische Korrektur der Laufrichtung von Polygonen beim Import zu erzwingen, muss die Option "Prüfung der Laufrichtung (2.2.2.1) überspringen" aktiviert sein. +IMPORTANT: Bei der Validierung werden die syntaktische und basisgeometrische Prüfung (s. Abschnitt <<xplanvalidator-web-geometrisch,geometrische Validierung>>) immer mit ausgeführt. Diese Prüfungen stellen sicher, dass ein Plan keine schwerwiegenden Fehler enthält, die einen Import verhindern. Um die automatische Korrektur der Laufrichtung von Polygonen beim Import zu erzwingen, muss die Option "Prüfung der Laufrichtung (2.2.2.1) überspringen" aktiviert sein. [[xplanmanager-web-import]] ===== Import diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanSynWFS.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanSynWFS.adoc index 62bbe9fb137aefd5ee4c7e52debd6ae93fd9aff0..d49c825577d1c9bd7596aef153d76b1689a20d22 100644 --- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanSynWFS.adoc +++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanSynWFS.adoc @@ -28,7 +28,7 @@ zusammen. Der XPlanSynWFS unterstützt Anfragen per HTTP GET (KVP) und POST (XML ==== Adresse des Dienstes ---- -http://<host>:<port>/xplansyn-wfs/services/xplansynwfs? +http://<host>:<port>/xplan-services-wfs-syn/services/xplansynwfs? ---- [[xplansynwfs-operationen]] @@ -46,7 +46,7 @@ Dienstbetreiber, zu den unterstützten Operationen sowie den durch den WFS angebotenen Objektarten. ---- -http://<host>:<port>/xplansyn-wfs/services/xplansynwfs?request=GetCapabilities&Service=WFS&Version=1.1.0 +http://<host>:<port>/xplan-services-wfs-syn/services/xplansynwfs?request=GetCapabilities&Service=WFS&Version=1.1.0 ---- [[xplansynwfs-getfeature]] @@ -58,7 +58,7 @@ Planinhalten mit GIS Clients zu nutzen, die die Schnittstellen WFS 1.1.0 bzw. WFS 2.0.0 unterstützen. ---- -http://<host>:<port>/xplansyn-wfs/services/xplansynwfs?request=GetFeature&Service=WFS&Version=1.1.0&typename=xplan:BP_Bereich +http://<host>:<port>/xplan-services-wfs-syn/services/xplansynwfs?request=GetFeature&Service=WFS&Version=1.1.0&typename=xplan:BP_Bereich ---- [[xplansynwfs-describefeaturetype]] @@ -68,7 +68,7 @@ Die Operation DescribeFeatureType gibt Informationen zur Struktur der einzelnen Feature Types wieder. ---- -http://<host>:<port>/xplansyn-wfs/services/xplansynwfs?request=DescribeFeatureType&Service=WFS&Version=1.1.0 +http://<host>:<port>/xplan-services-wfs-syn/services/xplansynwfs?request=DescribeFeatureType&Service=WFS&Version=1.1.0 ---- [[xplansynwfs-liststoredqueries]] @@ -79,7 +79,7 @@ StoredQueries zurück. Diese Operation steht nur in der Protokollversion 2.0.0 zur Verfügung. ---- -http://<host>:<port>/xplansyn-wfs/services/xplansynwfs?request=ListStoredQueries&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs-syn/services/xplansynwfs?request=ListStoredQueries&Service=WFS&Version=2.0.0 ---- === StoredQueries @@ -112,7 +112,14 @@ Die Nutzung der StoredQueries erfolgt über GetFeature-Anfragen. Beispielanfrage den Plan mit dem Namen _Musterdorf_: ---- -http://<host>:<port>/xplansyn-wfs/services/xplansynwfs?request=GetFeature&service=WFS&version=2.0.0&StoredQuery_ID=urn:ogc:def:query:OGC-WFS::PlanName&planName=Musterdorf +http://<host>:<port>/xplan-services-wfs-syn/services/xplansynwfs?request=GetFeature&service=WFS&version=2.0.0&StoredQuery_ID=urn:ogc:def:query:OGC-WFS::PlanName&planName=Musterdorf +---- + +Über den optionalen Parameter _srsName_ lässt sich das Koordinatenreferenzsystem der zurückzugebenden Geometrien angeben. Wird der Parameter nicht verwendet, erfolgt die Ausgabe der Geometrien in dem default-Koordinatenreferenzsystem des Dienstes. Der Parameter wird von allen StoredQueries unterstützt. +Beispielanfrage für den Plan mit dem Namen _Musterdorf_ mit _srsName=EPSG:4326_: + +---- +http://<host>:<port>/xplan-services-wfs-syn/services/xplansynwfs?request=GetFeature&service=WFS&version=2.0.0&StoredQuery_ID=urn:ogc:def:query:OGC-WFS::PlanName&planName=Musterdorf&srsName=EPSG:4326 ---- [[xplansynwfs-koordinatenreferenzsysteme]] diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanValidator_API.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanValidator_API.adoc index cf44c4a501c77a5b7c540873bb3c43533c59635d..6c8016b3a8112fab719dc50d3886ed25fcababba 100644 --- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanValidator_API.adoc +++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanValidator_API.adoc @@ -14,4 +14,4 @@ Die REST-API des XPlanValidator stellt folgende Ressourcen bereit: Eine vollständige Beschreibung der HTTP Status-Codes und der unterstützten Formate (Encodings) für die jeweiligen Ressourcen sind in der OpenAPI Schnittstellenbeschreibung enthalten. -NOTE: Die URL für die REST-API des XPlanValidator setzt sich wie folgt zusammen http://<host>:<port>/xplan-api-validator/xvalidator/api/v1/. Die URL für die xPlanBox-Demo lautet https://xplanbox.lat-lon.de/xvalidator/api/v1/. \ No newline at end of file +NOTE: Die URL für die REST-API des XPlanValidator setzt sich wie folgt zusammen http://<host>:<port>/xplan-validator-api/xvalidator/api/v1/. Die URL für die xPlanBox-Demo lautet https://xplanbox.lat-lon.de/xvalidator/api/v1/. \ No newline at end of file diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanWFS.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanWFS.adoc index fe8cf098c48348823aae447ef3142b76150bef3e..e1cd0581f0668f2a8d48d183abbab9257af0ff98 100644 --- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanWFS.adoc +++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanWFS.adoc @@ -62,14 +62,14 @@ Die folgende Tabelle fasst die vom XPlanWFS unterstützten Operationen zusammen. ==== Adresse des Dienstes ---- -http://<host>:<port>/xplan-wfs/services/wfs40? -http://<host>:<port>/xplan-wfs/services/wfs41? -http://<host>:<port>/xplan-wfs/services/wfs50? -http://<host>:<port>/xplan-wfs/services/wfs51? -http://<host>:<port>/xplan-wfs/services/wfs52? -http://<host>:<port>/xplan-wfs/services/wfs53? -http://<host>:<port>/xplan-wfs/services/wfs54? -http://<host>:<port>/xplan-wfs/services/wfs60? +http://<host>:<port>/xplan-services-wfs/services/wfs40? +http://<host>:<port>/xplan-services-wfs/services/wfs41? +http://<host>:<port>/xplan-services-wfs/services/wfs50? +http://<host>:<port>/xplan-services-wfs/services/wfs51? +http://<host>:<port>/xplan-services-wfs/services/wfs52? +http://<host>:<port>/xplan-services-wfs/services/wfs53? +http://<host>:<port>/xplan-services-wfs/services/wfs54? +http://<host>:<port>/xplan-services-wfs/services/wfs60? ---- @@ -88,14 +88,14 @@ Dienstbetreiber, zu den unterstützten Operationen sowie zu den durch den WFS angebotenen WFS Objektarten. ---- -http://<host>:<port>/xplan-wfs/services/wfs40?request=GetCapabilities&Service=WFS -http://<host>:<port>/xplan-wfs/services/wfs41?request=GetCapabilities&Service=WFS -http://<host>:<port>/xplan-wfs/services/wfs50?request=GetCapabilities&Service=WFS -http://<host>:<port>/xplan-wfs/services/wfs51?request=GetCapabilities&Service=WFS -http://<host>:<port>/xplan-wfs/services/wfs52?request=GetCapabilities&Service=WFS -http://<host>:<port>/xplan-wfs/services/wfs53?request=GetCapabilities&Service=WFS -http://<host>:<port>/xplan-wfs/services/wfs54?request=GetCapabilities&Service=WFS -http://<host>:<port>/xplan-wfs/services/wfs60?request=GetCapabilities&Service=WFS +http://<host>:<port>/xplan-services-wfs/services/wfs40?request=GetCapabilities&Service=WFS +http://<host>:<port>/xplan-services-wfs/services/wfs41?request=GetCapabilities&Service=WFS +http://<host>:<port>/xplan-services-wfs/services/wfs50?request=GetCapabilities&Service=WFS +http://<host>:<port>/xplan-services-wfs/services/wfs51?request=GetCapabilities&Service=WFS +http://<host>:<port>/xplan-services-wfs/services/wfs52?request=GetCapabilities&Service=WFS +http://<host>:<port>/xplan-services-wfs/services/wfs53?request=GetCapabilities&Service=WFS +http://<host>:<port>/xplan-services-wfs/services/wfs54?request=GetCapabilities&Service=WFS +http://<host>:<port>/xplan-services-wfs/services/wfs60?request=GetCapabilities&Service=WFS ---- [[xplanwfs-getfeature]] @@ -107,14 +107,14 @@ mit GIS Clients zu nutzen, die die Schnittstellen WFS 1.1.0 bzw. WFS 2.0.0 unterstützen. ---- -http://<host>:<port>/xplan-wfs/services/wfs40?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich -http://<host>:<port>/xplan-wfs/services/wfs41?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich -http://<host>:<port>/xplan-wfs/services/wfs50?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich -http://<host>:<port>/xplan-wfs/services/wfs51?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich -http://<host>:<port>/xplan-wfs/services/wfs52?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich -http://<host>:<port>/xplan-wfs/services/wfs53?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich -http://<host>:<port>/xplan-wfs/services/wfs54?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich -http://<host>:<port>/xplan-wfs/services/wfs60?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich +http://<host>:<port>/xplan-services-wfs/services/wfs40?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich +http://<host>:<port>/xplan-services-wfs/services/wfs41?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich +http://<host>:<port>/xplan-services-wfs/services/wfs50?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich +http://<host>:<port>/xplan-services-wfs/services/wfs51?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich +http://<host>:<port>/xplan-services-wfs/services/wfs52?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich +http://<host>:<port>/xplan-services-wfs/services/wfs53?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich +http://<host>:<port>/xplan-services-wfs/services/wfs54?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich +http://<host>:<port>/xplan-services-wfs/services/wfs60?request=GetFeature&Service=WFS&Version=2.0.0&typename=xplan:BP_Bereich ---- [[xplanwfs-describefeaturetype]] @@ -124,14 +124,14 @@ Die Operation DescribeFeatureType gibt Informationen zur Struktur der einzelnen Feature Types wieder. ---- -http://<host>:<port>/xplan-wfs/services/wfs40?request=DescribeFeatureType&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs41?request=DescribeFeatureType&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs50?request=DescribeFeatureType&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs51?request=DescribeFeatureType&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs52?request=DescribeFeatureType&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs53?request=DescribeFeatureType&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs54?request=DescribeFeatureType&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs60?request=DescribeFeatureType&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs40?request=DescribeFeatureType&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs41?request=DescribeFeatureType&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs50?request=DescribeFeatureType&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs51?request=DescribeFeatureType&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs52?request=DescribeFeatureType&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs53?request=DescribeFeatureType&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs54?request=DescribeFeatureType&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs60?request=DescribeFeatureType&Service=WFS&Version=2.0.0 ---- [[xplanwfs-liststoredqueries]] @@ -142,14 +142,14 @@ StoredQueries zurück. Diese Operation steht nur in der Protokollversion 2.0.0 über die Endpunkte __wfs40__, __wfs41__, __wfs50__, __wfs51__, __wfs52__, __wfs53__ und __wfs54__ zur Verfügung. ---- -http://<host>:<port>/xplan-wfs/services/wfs40?request=ListStoredQueries&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs41?request=ListStoredQueries&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs50?request=ListStoredQueries&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs51?request=ListStoredQueries&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs52?request=ListStoredQueries&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs53?request=ListStoredQueries&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs54?request=ListStoredQueries&Service=WFS&Version=2.0.0 -http://<host>:<port>/xplan-wfs/services/wfs60?request=ListStoredQueries&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs40?request=ListStoredQueries&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs41?request=ListStoredQueries&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs50?request=ListStoredQueries&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs51?request=ListStoredQueries&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs52?request=ListStoredQueries&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs53?request=ListStoredQueries&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs54?request=ListStoredQueries&Service=WFS&Version=2.0.0 +http://<host>:<port>/xplan-services-wfs/services/wfs60?request=ListStoredQueries&Service=WFS&Version=2.0.0 ---- ==== StoredQueries @@ -176,7 +176,14 @@ Die Nutzung der StoredQueries erfolgt über GetFeature-Anfragen. Beispielanfrage den Plan mit dem Namen _Musterdorf_ in der XPlanGML-Version 5.4: ---- -http://<host>:<port>/xplan-wfs/services/wfs54?request=GetFeature&service=WFS&version=2.0.0&resolvedepth=*&StoredQuery_ID=urn:ogc:def:query:OGC-WFS::PlanName&planName=Musterdorf +http://<host>:<port>/xplan-services-wfs/services/wfs54?request=GetFeature&service=WFS&version=2.0.0&resolvedepth=*&StoredQuery_ID=urn:ogc:def:query:OGC-WFS::PlanName&planName=Musterdorf +---- + +Über den optionalen Parameter _srsName_ lässt sich das Koordinatenreferenzsystem der zurückzugebenden Geometrien angeben. Wird der Parameter nicht verwendet, erfolgt die Ausgabe der Geometrien in dem default-Koordinatenreferenzsystem des Dienstes. Der Parameter wird von allen StoredQueries unterstützt. +Beispielanfrage für den Plan mit dem Namen _Musterdorf_ in der XPlanGML-Version 5.4 mit _srsName=EPSG:4326_: + +---- +http://<host>:<port>/xplan-services-wfs/services/wfs54?request=GetFeature&service=WFS&version=2.0.0&resolvedepth=*&StoredQuery_ID=urn:ogc:def:query:OGC-WFS::PlanName&planName=Musterdorf&srsName=EPSG:4326 ---- [[xplanwfs-koordinatenreferenzsysteme]] diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanWMS.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanWMS.adoc index c25831c2e3980d52c27e6a84567042916a143969..755a680a9b523480dd7af90952f3337b61cb8fad 100644 --- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanWMS.adoc +++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/XPlanWMS.adoc @@ -30,7 +30,7 @@ Die folgende Tabelle gibt einen Überblick über die zur Verfügung stehenden Op ==== Adresse des XPlanWMS ---- -http://<host>:<port>/xplan-wms/services/wms? +http://<host>:<port>/xplan-services-wms/services/wms? ---- [[xplanwms-adresse-xplanwerkwms]] @@ -43,7 +43,7 @@ Die vollständige XPlanWerkWMS URL kann über die Kartenvorschau im XPlanManager IMPORTANT: Vermeiden Sie Sonderzeichen im Plannamen wie z. B. `:`, `&`, `#` , `/`, `\`, `?`, `@`, `'`, `"` oder Zeilenumbrüche. ---- -http://<host>:<port>/xplan-wms/services/planwerkwms/planname/<PLANNAME> +http://<host>:<port>/xplan-services-wms/services/planwerkwms/planname/<PLANNAME> ---- TIP: Alternativ kann die URL auch ohne Sonderzeichen verwendet werden. Dafür müssen alle anderen Zeichen als `a-zA-Z0-9-_` aus <PLANNAME> entfernt werden. Die so erstellte URL liefert eine identische Response wie die dazugehörige, kodierte URL. @@ -55,7 +55,7 @@ Die Adresse des XPlanWerkWMS ist abhängig von der Planart die angefragt werden Neben der Planart ist auch der Planstatus bei der Nutzung des XPlanArtWMS entscheidend, so setzt sich der Name nach folgendem Schema zusammen _XPlanArtWMS<PLANART><PLANSTATUS>_, z.B. _XPlanArtWMSBPlanArchive_. Die URL des WMS ist wie folgt aufgebaut: ---- -http://<host>:<port>/xplan-wms/services/<PLANART>wms<PLANSTATUS>? +http://<host>:<port>/xplan-services-wms/services/<PLANART>wms<PLANSTATUS>? ---- Die folgende Tabelle listet die Endpunkte des XPlanArtWMS auf: @@ -69,63 +69,63 @@ Die folgende Tabelle listet die Endpunkte des XPlanArtWMS auf: |XPlanArtWMSBPlan |BPlan |Festgestellt -|http://<host>:<port>/xplan-wms/services/bpwms? +|http://<host>:<port>/xplan-services-wms/services/bpwms? |XPlanArtWMSBPlanPre |BPlan |In Aufstellung -|http://<host>:<port>/xplan-wms/services/bpwmspre? +|http://<host>:<port>/xplan-services-wms/services/bpwmspre? |XPlanArtWMSBPlanArchive |BPlan |Archiviert -|http://<host>:<port>/xplan-wms/services/bpwmsarchive? +|http://<host>:<port>/xplan-services-wms/services/bpwmsarchive? |XPlanArtWMSFPlan |FPlan |Festgestellt -|http://<host>:<port>/xplan-wms/services/fpwms? +|http://<host>:<port>/xplan-services-wms/services/fpwms? |XPlanArtWMSFPlanPre |FPlan |In Aufstellung -|http://<host>:<port>/xplan-wms/services/fpwmspre? +|http://<host>:<port>/xplan-services-wms/services/fpwmspre? |XPlanArtWMSFPlanArchive |FPlan |Archiviert -|http://<host>:<port>/xplan-wms/services/fpwmsarchive? +|http://<host>:<port>/xplan-services-wms/services/fpwmsarchive? |XPlanArtWMSLPlan |LPlan |Festgestellt -|http://<host>:<port>/xplan-wms/services/lpwms? +|http://<host>:<port>/xplan-services-wms/services/lpwms? |XPlanArtWMSLPlanPre |LPlan |In Aufstellung -|http://<host>:<port>/xplan-wms/services/lpwmspre? +|http://<host>:<port>/xplan-services-wms/services/lpwmspre? |XPlanArtWMSLPlanArchive |LPlan |Archiviert -|http://<host>:<port>/xplan-wms/services/lpwmsarchive? +|http://<host>:<port>/xplan-services-wms/services/lpwmsarchive? |XPlanArtWMSRPlan |RPlan |Festgestellt -|http://<host>:<port>/xplan-wms/services/rpwms? +|http://<host>:<port>/xplan-services-wms/services/rpwms? |XPlanArtWMSRPlanPre |RPlan |In Aufstellung -|http://<host>:<port>/xplan-wms/services/rlpwmspre? +|http://<host>:<port>/xplan-services-wms/services/rlpwmspre? |XPlanArtWMSRPlanArchive |RPlan |Archiviert -|http://<host>:<port>/xplan-wms/services/rpwmsarchive? +|http://<host>:<port>/xplan-services-wms/services/rpwmsarchive? |XPlanArtWMSSOPlan |SOPlan |Festgestellt -|http://<host>:<port>/xplan-wms/services/sowms? +|http://<host>:<port>/xplan-services-wms/services/sowms? |XPlanArtWMSSOPlanPre |SOPlan |In Aufstellung -|http://<host>:<port>/xplan-wms/services/sowmspre? +|http://<host>:<port>/xplan-services-wms/services/sowmspre? |XPlanArtWMSSOPlanArchive |SOPlan |Archiviert -|http://<host>:<port>/xplan-wms/services/sowmsarchive? +|http://<host>:<port>/xplan-services-wms/services/sowmsarchive? |=== @@ -144,20 +144,20 @@ WMS angebotenen WMS Ebenen. *XPlanWMS* ---- -http://<host>:<port>/xplan-wms/services/wms?request=GetCapabilities&service=WMS&version=1.1.1 -http://<host>:<port>/xplan-wms/services/wms?request=GetCapabilities&service=WMS&version=1.3.0 +http://<host>:<port>/xplan-services-wms/services/wms?request=GetCapabilities&service=WMS&version=1.1.1 +http://<host>:<port>/xplan-services-wms/services/wms?request=GetCapabilities&service=WMS&version=1.3.0 ---- *XPlanWerkWMS* ---- -http://<host>:<port>/xplan-wms/services/planwerkwms/planname/<PLANNAME>?request=GetCapabilities&service=WMS&version=1.1.1 -http://<host>:<port>/xplan-wms/services/planwerkwms/planname/<PLANNAME>?request=GetCapabilities&service=WMS&version=1.3.0 +http://<host>:<port>/xplan-services-wms/services/planwerkwms/planname/<PLANNAME>?request=GetCapabilities&service=WMS&version=1.1.1 +http://<host>:<port>/xplan-services-wms/services/planwerkwms/planname/<PLANNAME>?request=GetCapabilities&service=WMS&version=1.3.0 ---- *XPlanArtWMS* ---- -http://<host>:<port>/xplan-wms/services/<PLANART>wms<PLANSTATUS>?request=GetCapabilities&service=WMS&version=1.1.1 -http://<host>:<port>/xplan-wms/services/<PLANART>wms<PLANSTATUS>?request=GetCapabilities&service=WMS&version=1.3.0 +http://<host>:<port>/xplan-services-wms/services/<PLANART>wms<PLANSTATUS>?request=GetCapabilities&service=WMS&version=1.1.1 +http://<host>:<port>/xplan-services-wms/services/<PLANART>wms<PLANSTATUS>?request=GetCapabilities&service=WMS&version=1.3.0 ---- [[xplanwms-getmap]] @@ -170,14 +170,14 @@ unterstützen. *XPlanWMS* ---- -http://<host>:<port>/xplan-wms/services/wms?request=GetMap&Service=WMS&Version=1.1.1&Layers=bp_plan&Format=image/png&Transparent=true&Styles=&Srs=EPSG%3A25833&Bbox=377814.52931834,5697447.998419,381059.6791237,5698548.3070248&Width=1280&Height=434 -http://<host>:<port>/xplan-wms/services/wms?request=GetMap&Service=WMS&Version=1.3.0&Layers=bp_plan&Format=image/png&Transparent=true&Styles=&Crs=EPSG%3A25833&Bbox=377814.52931834,5697447.998419,381059.6791237,5698548.3070248&Width=1280&Height=434 +http://<host>:<port>/xplan-services-wms/services/wms?request=GetMap&Service=WMS&Version=1.1.1&Layers=bp_plan&Format=image/png&Transparent=true&Styles=&Srs=EPSG%3A25833&Bbox=377814.52931834,5697447.998419,381059.6791237,5698548.3070248&Width=1280&Height=434 +http://<host>:<port>/xplan-services-wms/services/wms?request=GetMap&Service=WMS&Version=1.3.0&Layers=bp_plan&Format=image/png&Transparent=true&Styles=&Crs=EPSG%3A25833&Bbox=377814.52931834,5697447.998419,381059.6791237,5698548.3070248&Width=1280&Height=434 ---- *XPlanWerkWMS* ---- -http://<host>:<port>/xplan-wms/services/planwerkwms/planname/<PLANNAME>?request=GetMap&Service=WMS&Version=1.1.1&Layers=bp_plan&Format=image/png&Transparent=true&Styles=&Srs=EPSG%3A25833&Bbox=377814.52931834,5697447.998419,381059.6791237,5698548.3070248&Width=1280&Height=434 -http://<host>:<port>/xplan-wms/services/planwerkwms/planname/<PLANNAME>?request=GetMap&Service=WMS&Version=1.3.0&Layers=bp_plan&Format=image/png&Transparent=true&Styles=&Crs=EPSG%3A25833&Bbox=377814.52931834,5697447.998419,381059.6791237,5698548.3070248&Width=1280&Height=434 +http://<host>:<port>/xplan-services-wms/services/planwerkwms/planname/<PLANNAME>?request=GetMap&Service=WMS&Version=1.1.1&Layers=bp_plan&Format=image/png&Transparent=true&Styles=&Srs=EPSG%3A25833&Bbox=377814.52931834,5697447.998419,381059.6791237,5698548.3070248&Width=1280&Height=434 +http://<host>:<port>/xplan-services-wms/services/planwerkwms/planname/<PLANNAME>?request=GetMap&Service=WMS&Version=1.3.0&Layers=bp_plan&Format=image/png&Transparent=true&Styles=&Crs=EPSG%3A25833&Bbox=377814.52931834,5697447.998419,381059.6791237,5698548.3070248&Width=1280&Height=434 ---- [[xplanwms-styles]] @@ -239,14 +239,14 @@ Dokumente und Grafiken über die Operation <<xplanwms-getattachement>> abzurufen *XPlanWMS* ---- -http://<host>:<port>/xplan-wms/services/wms?request=GetFeatureInfo&Service=WMS&Version=1.3.0&Width=460&Height=348&Layers=fp_bebausfl&Transparent=TRUE&Format=image%2Fpng&BBox=381754.08781343646,5716831.670553746,382351.0673120646,5717283.298522273&Crs=EPSG:25833&Styles=&Query_layers=fp_bebausfl&I=217&J=94&Feature_count=10&Info_format=text/html -http://<host>:<port>/xplan-wms/services/wms?request=GetFeatureInfo&Service=WMS&Version=1.3.0&Width=460&Height=348&Layers=fp_bebausfl&Transparent=TRUE&Format=image%2Fpng&BBox=381754.08781343646,5716831.670553746,382351.0673120646,5717283.298522273&Crs=EPSG:25833&Styles=&Query_layers=fp_bebausfl&I=217&J=94&Feature_count=10&info_format=application/vnd.ogc.gml +http://<host>:<port>/xplan-services-wms/services/wms?request=GetFeatureInfo&Service=WMS&Version=1.3.0&Width=460&Height=348&Layers=fp_bebausfl&Transparent=TRUE&Format=image%2Fpng&BBox=381754.08781343646,5716831.670553746,382351.0673120646,5717283.298522273&Crs=EPSG:25833&Styles=&Query_layers=fp_bebausfl&I=217&J=94&Feature_count=10&Info_format=text/html +http://<host>:<port>/xplan-services-wms/services/wms?request=GetFeatureInfo&Service=WMS&Version=1.3.0&Width=460&Height=348&Layers=fp_bebausfl&Transparent=TRUE&Format=image%2Fpng&BBox=381754.08781343646,5716831.670553746,382351.0673120646,5717283.298522273&Crs=EPSG:25833&Styles=&Query_layers=fp_bebausfl&I=217&J=94&Feature_count=10&info_format=application/vnd.ogc.gml ---- *XPlanWerkWMS* ---- -http://<host>:<port>/xplan-wms/services/planwerkwms/planname/<PLANNAME>?request=GetFeatureInfo&Service=WMS&Version=1.3.0&Width=460&Height=348&Layers=fp_bebausfl&Transparent=TRUE&Format=image%2Fpng&BBox=381754.08781343646,5716831.670553746,382351.0673120646,5717283.298522273&Crs=EPSG:25833&Styles=&Query_layers=fp_bebausfl&I=217&J=94&Feature_count=10&Info_format=text/html -http://<host>:<port>/xplan-wms/services/planwerkwms/planname/<PLANNAME>?request=GetFeatureInfo&Service=WMS&Version=1.3.0&Width=460&Height=348&Layers=fp_bebausfl&Transparent=TRUE&Format=image%2Fpng&BBox=381754.08781343646,5716831.670553746,382351.0673120646,5717283.298522273&Crs=EPSG:25833&Styles=&Query_layers=fp_bebausfl&I=217&J=94&Feature_count=10&info_format=application/vnd.ogc.gml +http://<host>:<port>/xplan-services-wms/services/planwerkwms/planname/<PLANNAME>?request=GetFeatureInfo&Service=WMS&Version=1.3.0&Width=460&Height=348&Layers=fp_bebausfl&Transparent=TRUE&Format=image%2Fpng&BBox=381754.08781343646,5716831.670553746,382351.0673120646,5717283.298522273&Crs=EPSG:25833&Styles=&Query_layers=fp_bebausfl&I=217&J=94&Feature_count=10&Info_format=text/html +http://<host>:<port>/xplan-services-wms/services/planwerkwms/planname/<PLANNAME>?request=GetFeatureInfo&Service=WMS&Version=1.3.0&Width=460&Height=348&Layers=fp_bebausfl&Transparent=TRUE&Format=image%2Fpng&BBox=381754.08781343646,5716831.670553746,382351.0673120646,5717283.298522273&Crs=EPSG:25833&Styles=&Query_layers=fp_bebausfl&I=217&J=94&Feature_count=10&info_format=application/vnd.ogc.gml ---- [[xplanwms-getlegendgraphic]] @@ -258,14 +258,14 @@ Abfragen von Legendengrafiken der Ebenen. *XPlanWMS* ---- -http://<host>:<port>/xplan-wms/services/wms?request=GetLegendGraphic&Service=WMS&Version=1.1.1&layer=bp_gruenfl&format=image/png -http://<host>:<port>/xplan-wms/services/wms?request=GetLegendGraphic&Service=WMS&Version=1.3.0&layer=bp_gruenfl&format=image/png +http://<host>:<port>/xplan-services-wms/services/wms?request=GetLegendGraphic&Service=WMS&Version=1.1.1&layer=bp_gruenfl&format=image/png +http://<host>:<port>/xplan-services-wms/services/wms?request=GetLegendGraphic&Service=WMS&Version=1.3.0&layer=bp_gruenfl&format=image/png ---- *XPlanWerkWMS* ---- -http://<host>:<port>/xplan-wms/services/planwerkwms/planname/<PLANNAME>?request=GetLegendGraphic&Service=WMS&Version=1.1.1&layer=bp_gruenfl&format=image/png -http://<host>:<port>/xplan-wms/services/planwerkwms/planname/<PLANNAME>?request=GetLegendGraphic&Service=WMS&Version=1.3.0&layer=bp_gruenfl&format=image/png +http://<host>:<port>/xplan-services-wms/services/planwerkwms/planname/<PLANNAME>?request=GetLegendGraphic&Service=WMS&Version=1.1.1&layer=bp_gruenfl&format=image/png +http://<host>:<port>/xplan-services-wms/services/planwerkwms/planname/<PLANNAME>?request=GetLegendGraphic&Service=WMS&Version=1.3.0&layer=bp_gruenfl&format=image/png ---- [[xplanwms-getattachement]] @@ -281,7 +281,7 @@ Die Operation unterstützt folgende Parameter: *XPlanWMS* ---- -http://<host>:<port>/xplan-wms/getAttachment?featureID=XPLAN_XP_RASTERPLANBASIS_7b36b0ee-5139-4a55-afc0-01fec18e9f0a&filename=Stellingen64.png +http://<host>:<port>/xplan-services-wms/getAttachment?featureID=XPLAN_XP_RASTERPLANBASIS_7b36b0ee-5139-4a55-afc0-01fec18e9f0a&filename=Stellingen64.png ---- [[xplanwms-koordinatenreferenzsysteme]] diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/ausblick.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/ausblick.adoc index be2a88d603ab752a70b6067ee5af7577a00bcc19..938d98f47842e3573c6979d491828f41b3bfa74f 100644 --- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/ausblick.adoc +++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/ausblick.adoc @@ -5,7 +5,7 @@ Die Leitstelle XPlanung/XBau hat einen https://www.xleitstelle.de/leitfaden[Leit === Einbindung in andere Software -Zur Betrachtung der über den XPlanManager importierten Planwerke bietet sich die Einbindung des <<xplanwms, XPlanWMS oder XPlanWerkWMS>> in einen geeigneten Client an. Da es sich bei beiden Diensten jeweils um einen standardkonformen WMS handelt, kann jeder Client verwendet werden, der diese Schnittstelle in den Versionen 1.1.1 und 1.3.0 unterstützt. -Der Zugriff auf die XPlanGML-Daten ist über den XPlanSynWFS oder die versionsspezifischen <<xplanwfs, XPlanWFS-Dienste>> möglich. +Zur Betrachtung der über den XPlanManager importierten Planwerke bietet sich die Einbindung des <<xplanwms,XPlanWMS oder XPlanWerkWMS>> in einen geeigneten Client an. Da es sich bei beiden Diensten jeweils um einen standardkonformen WMS handelt, kann jeder Client verwendet werden, der diese Schnittstelle in den Versionen 1.1.1 und 1.3.0 unterstützt. +Der Zugriff auf die XPlanGML-Daten ist über den XPlanSynWFS oder die versionsspezifischen <<xplanwfs,XPlanWFS-Dienste>> möglich. TIP: Als Desktop-Client wird https://qgis.org/[QGIS] empfohlen. Als WebGIS-Client wird das https://www.masterportal.org[Masterportal] empfohlen. Detaillierte Informationen zur Installation, Konfiguration und Benutzung finden sich in der Dokumentation der jeweiligen Software. diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/ueberblick.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/ueberblick.adoc index 9e326128cb0401463bc5c54176ebfa7715424aa7..4a2a07a0ee1e9ad0473cb137be583c9605c6c048 100644 --- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/ueberblick.adoc +++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/ueberblick.adoc @@ -19,10 +19,10 @@ folgenden Komponenten: * <<xplanwms,XPlanWMS>>: Standard-Kartendienst (WMS) für die Auskunft * <<xplanwfs,XPlanWFS>>: Standard-Datendienst (WFS) für die Auskunft (XPlanGML-konforme Datenstruktur) * <<xplansynwfs,XPlanSynWFS>>: Standard-Datendienst (WFS) für die Auskunft (vereinfachte Datenstruktur) - * <<xplandokumenten-api, XPlanDokumentenAPI>>: Optionale Komponente für den Zugriff auf Dokumente aus einem <<xplanarchiv, XPlanArchiv>> - * <<xplantransform-cli, XPlanTransformCLI>>: Kommandozeilenwerkzeug für die Transformation von Plänen - * <<xplaninspirepluwms, XPlanInspirePluWMS>>: Optionale Komponente mit INSPIRE View Service für die Auskunft im INSPIRE Datenthema Planned Land Use (PLU) - * <<xplaninspirepluwfs, XPlanInspirePluWFS>>: Optionale Komponente mit INSPIRE Download Service für die Auskunft im INSPIRE Datenthema Planned Land Use (PLU) + * <<xplandokumenten-api,XPlanDokumentenAPI>>: Optionale Komponente für den Zugriff auf Dokumente aus einem <<xplanarchiv, XPlanArchiv>> + * <<xplantransform-cli,XPlanTransformCLI>>: Kommandozeilenwerkzeug für die Transformation von Plänen + * <<xplaninspirepluwms,XPlanInspirePluWMS>>: Optionale Komponente mit INSPIRE View Service für die Auskunft im INSPIRE Datenthema Planned Land Use (PLU) + * <<xplaninspirepluwfs,XPlanInspirePluWFS>>: Optionale Komponente mit INSPIRE Download Service für die Auskunft im INSPIRE Datenthema Planned Land Use (PLU) Aktuell werden für Bebauungspläne, Flächennutzungspläne, Landschaftspläne und Raumordnungspläne die XPlanGML-Versionen 4.0, 4.1, 5.0, 5.1, 5.2, 5.3, 5.4 und 6.0 durch die xPlanBox unterstützt. Für sonstige raumbezogene Planwerke werden die XPlanGML-Versionen 5.0, 5.1, 5.2, 5.3, 5.4 und 6.0 unterstützt. diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc index e133c5bd2ac0f89e418ad969294aed8e91f1795c..7141832b40d66f61838199df33d6eb7e5635a839 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc @@ -30,15 +30,16 @@ der jeweiligen Tomcat-Instanz kopiert werden. Als Platzhalter werden im Folgenden __<WORK_DIR>__ als Download-Verzeichnis mit der entpackten Distributionsdatei und __<CATALINA_HOME>__ mit dem Installationsverzeichnis des Tomcat-Servers verwendet. ---- +# Anwendungs-Tomcat cp ${WORK_DIR}/web/xplan-manager-web.war <CATALINA_HOME>/webapps/ cp ${WORK_DIR}/web/xplan-validator-web.war <CATALINA_HOME>/webapps/ - -cp ${WORK_DIR}/web/xplan-api-manager.war <CATALINA_HOME>/webapps/ -cp ${WORK_DIR}/web/xplan-api-validator.war <CATALINA_HOME>/webapps/ - -cp ${WORK_DIR}/web/xplansyn-wfs.war <CATALINA_HOME>/webapps/ -cp ${WORK_DIR}/web/xplan-wfs.war <CATALINA_HOME>/webapps/ -cp ${WORK_DIR}/web/xplan-wms.war <CATALINA_HOME>/webapps/ +# API-Tomcat +cp ${WORK_DIR}/web/xplan-manager-api.war <CATALINA_HOME>/webapps/ +cp ${WORK_DIR}/web/xplan-validator-api.war <CATALINA_HOME>/webapps/ +# Dienste-Tomcat +cp ${WORK_DIR}/web/xplan-services-wfs-syn.war <CATALINA_HOME>/webapps/ +cp ${WORK_DIR}/web/xplan-services-wfs.war <CATALINA_HOME>/webapps/ +cp ${WORK_DIR}/web/xplan-services-wms.war <CATALINA_HOME>/webapps/ ---- NOTE: Falls die Hintergrundkarte der Kartenvorschau im XPlanValidatorWeb angepasst wurde, müssen die Änderungen in der Datei _services-internet.template.json_ manuell in die neue Webapp _xplan-validator-web_ übertragen werden (s. <<kartenvorschau-validator>>). @@ -54,12 +55,12 @@ Es müssen alle Tomcat-Instanzen neu gestartet werden. Der Neustart muss nach de Die ZIP-Archive mit den <<kommandozeilen-anwendungen,Kommandozeilenwerkzeugen>> müssen entpackt werden: ---- -unzip ${WORK_DIR}/cli/xplan-manager-cli-${VERSION}.zip -unzip ${WORK_DIR}/cli/xplan-validator-cli-${VERSION}.zip -unzip ${WORK_DIR}/cli/xplan-transform-cli-${VERSION}.zip -unzip ${WORK_DIR}/cli/xplan-update-data-cli-${VERSION}.zip -unzip ${WORK_DIR}/cli/xplan-validatedb-cli-${VERSION}.zip -unzip ${WORK_DIR}/cli/xplan-evaluation-schema-synchronize-cli--${VERSION}.zip +unzip ${WORK_DIR}/bin/xplan-manager-cli.zip +unzip ${WORK_DIR}/bin/xplan-transform-cli.zip +unzip ${WORK_DIR}/bin/xplan-update-data-cli.zip +unzip ${WORK_DIR}/bin/xplan-validator-cli.zip +unzip ${WORK_DIR}/bin/xplan-validatedb-cli.zip +unzip ${WORK_DIR}/bin/xplan-evaluation-schema-synchronize-cli.zip ---- === Übersicht über die Datenhaltung betreffende Änderungen @@ -99,31 +100,31 @@ Es müssen die bereitgestellten Konfigurationsdateien in das Verzeichnis _<DEEGR Diese ersetzen die bereits vorhandenen: ---- -cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/config/xplan-workspaces-${VERSION}-xplan-manager-workspace.zip -cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/config/xplan-workspaces-${VERSION}-xplan-wfs-workspace.zip -cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/config/xplan-workspaces-${VERSION}-xplansyn-wfs-workspace.zip -cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/config/xplan-workspaces-${VERSION}-xplansyn-wms-workspace.zip -cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/config/xplan-workspaces-${VERSION}-xplan-inspireplu-workspace.zip -cd ${XPLANBOX_CONFIG} && unzip -o ${WORK_DIR}/config/xplan-manager-config-${VERSION}.zip -cd ${XPLANBOX_CONFIG} && unzip -o ${WORK_DIR}/config/xplan-validator-config-${VERSION}.zip +cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/conf/xplan-manager-workspace.zip +cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/conf/xplan-services-wfs-workspace.zip +cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/conf/xplan-services-wfs-syn-workspace.zip +cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/conf/xplan-services-wms-workspace.zip +cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/conf/xplan-webservices-inspireplu-workspace.zip +cd ${XPLANBOX_CONFIG} && unzip -o ${WORK_DIR}/conf/xplan-manager-config-default.zip +cd ${XPLANBOX_CONFIG} && unzip -o ${WORK_DIR}/conf/xplan-validator-config.zip ---- [[teilweise-aktualisierung]] ==== Teilweise Aktualisierung der Workspaces -Es müssen die bereitgestellten Konfigurationsdateien mit Ausnahme des _xplansyn-wms-workspace_ in das Verzeichnis +Es müssen die bereitgestellten Konfigurationsdateien mit Ausnahme des _xplan-services-wms-workspace_ in das Verzeichnis _<DEEGREE_WORKSPACE_ROOT>_ kopiert werden. Diese ersetzen die bereits vorhanden: ---- -cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/config/xplan-workspaces-${VERSION}-xplan-manager-workspace.zip -cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/config/xplan-workspaces-${VERSION}-xplan-wfs-workspace-.zip -cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/config/xplan-workspaces-${VERSION}-xplansyn-wfs-workspace.zip -cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/config/xplan-workspaces-${VERSION}-xplan-inspireplu-workspace.zip -cd ${XPLANBOX_CONFIG} && unzip -o ${WORK_DIR}/config/xplan-manager-config-${VERSION}.zip -cd ${XPLANBOX_CONFIG} && unzip -o ${WORK_DIR}/config/xplan-validator-config-${VERSION}.zip +cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/conf/xplan-manager-workspace.zip +cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/conf/xplan-services-wfs-workspace-.zip +cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/conf/xplan-services-wfs-syn-workspace.zip +cd ${DEEGREE_WORKSPACE_ROOT} && unzip -o ${WORK_DIR}/conf/xplan-webservices-inspireplu-workspace.zip +cd ${XPLANBOX_CONFIG} && unzip -o ${WORK_DIR}/conf/xplan-manager-config-default.zip +cd ${XPLANBOX_CONFIG} && unzip -o ${WORK_DIR}/conf/xplan-validator-config.zip ---- -Folgende Verzeichnisse des neuen _xplansyn-wms-workspace_ müssen in die bestehende Installation integriert werden: +Folgende Verzeichnisse des neuen _xplan-services-wms-workspace_ müssen in die bestehende Installation integriert werden: * _appschemas/_ * _datasources/feature/_ @@ -207,8 +208,8 @@ Für die Aktualisierung auf die Version 6.0.1 sind folgende Schritte auszuführe Für eine Installation der Bugfix-Version müssen folgende Schritte ausgeführt werden: * Austausch der Webapps: -** _xplan-api-validator.war_ -** _xplan-api-manager.war_ +** _xplan-validator-api.war_ +** _xplan-manager-api.war_ ** _xplan-validator-web.war_ ** _xplan-manager-web.war_ @@ -220,8 +221,8 @@ TIP: Alle anderen Komponenten sind unverändert und müssen nicht aktualisiert w Für eine Installation der Bugfix-Version müssen folgende Schritte ausgeführt werden: * Austausch der Webapps: -** _xplan-api-validator.war_ -** _xplan-api-manager.war_ +** _xplan-validator-api.war_ +** _xplan-manager-api.war_ ** _xplan-validator-web.war_ ** _xplan-manager-web.war_ @@ -250,12 +251,12 @@ IMPORTANT: Mit der Version 7.0 der xPlanBox ist die Kartenvorschau im XPlanValid Für eine Installation der Bugfix-Version müssen folgende Schritte ausgeführt werden: * Austausch der Webapps: -** _xplan-api-validator.war_ -** _xplan-api-manager.war_ +** _xplan-validator-api.war_ +** _xplan-manager-api.war_ ** _xplan-validator-web.war_ ** _xplan-manager-web.war_ * Aktualisierung des Workspace und der Konfigurationen (s. <<teilweise-aktualisierung>>) für: -** _xplansyn-wms-workspace_ +** _xplan-services-wms-workspace_ TIP: Alle anderen Komponenten sind unverändert und müssen nicht aktualisiert werden. @@ -265,8 +266,8 @@ TIP: Alle anderen Komponenten sind unverändert und müssen nicht aktualisiert w Für eine Installation der Bugfix-Version müssen folgende Schritte ausgeführt werden: * Austausch der Webapps: -** _xplan-api-validator.war_ -** _xplan-api-manager.war_ +** _xplan-validator-api.war_ +** _xplan-manager-api.war_ ** _xplan-validator-web.war_ ** _xplan-manager-web.war_ * Austausch der ZIP-Datei mit dem XPlanUpdateDataCLI und Ausführung des Kommandozeilenwerkzeugs __artefactsTableUpdate__ zur Aktualisierung der XPlanDB, wenn dieses bei der Installation der Version 7.0 oder 7.0.1 nicht erfolgreich ausgeführt werden konnte. diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/anhang/aktualisierung.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/anhang/aktualisierung.adoc index c9550bf4e8b7c22c310f5c2b63b18a27fa8c9c91..b8afe2c75b8f3473c69a8fe7aca32673bc8d5280 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/anhang/aktualisierung.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/anhang/aktualisierung.adoc @@ -14,18 +14,18 @@ Die Zuordnung der Anwendungskomponenten zu den jeweiligen Konfigurationen ist im * [ ] Alle Tomcat-Instanzen sind gestoppt * [ ] Sicherungskopie der WAR-Dateien bzw. die entpackten Verzeichnisse aus _Dienste-Tomcat/webapps/_, _Anwendungs-Tomcat/webapps/_, _API-Tomcat/webapps/_ ist im Verzeichnis _<BACKUP_CONFIG>_ abgelegt. * [ ] Folgenden Dateien sind nach _Dienste-Tomcat/webapps/_ kopiert: - ** _xplan-wms.war_ - ** _xplan-wfs.war_ - ** _xplansyn-wfs.war_ - ** _xplan-inspireplu.war_ - ** _xplan-validator-wms.war_ + ** _xplan-services-wms.war_ + ** _xplan-services-wfs.war_ + ** _xplan-services-wfs-syn.war_ + ** _xplan-webservices-inspireplu.war_ + ** _xplan-webservices-validator-wms.war_ * [ ] Folgenden Dateien sind nach _Anwendungs-Tomcat/webapps/_ kopiert: ** _xplan-manager-web.war_ ** _xplan-validator-web.war_ - ** _xplan-root.war_ + ** _xplan-webpages-default.war_ * [ ] Folgenden Dateien sind nach _API-Tomcat/webapps/_ kopiert: - ** _xplan-api-manager.war_ - ** _xplan-api-validator.war_ + ** _xplan-manager-api.war_ + ** _xplan-validator-api.war_ ==== Checkliste für die Übernahme von Konfigurationen der Webanwendungen @@ -78,31 +78,31 @@ NOTE: Diese Schritte sind nur erforderlich, wenn nur der der XPlanValidator inst ==== Checkliste für XPlanSynWFS Workspace Konfiguration -* [ ] Konfiguration im Verzeichnis _<DEEGREE_WORKSPACE_ROOT>/xplansyn-wfs-workspace/_ aktualisiert: - ** _<BACKUP_CONFIG>/xplansyn-wfs-workspace/jdbc/_ kopiert +* [ ] Konfiguration im Verzeichnis _<DEEGREE_WORKSPACE_ROOT>/xplan-services-wfs-syn-workspace/_ aktualisiert: + ** _<BACKUP_CONFIG>/xplan-services-wfs-syn-workspace/jdbc/_ kopiert ==== Checkliste für XPlanWMS Workspace Konfiguration -* [ ] Konfiguration im Verzeichnis _<DEEGREE_WORKSPACE_ROOT>/xplansyn-wms-workspace/_ aktualisiert: - ** _<BACKUP_CONFIG>/xplansyn-wms-workspace/jdbc/_ kopiert - ** _<BACKUP_CONFIG>/xplansyn-wms-workspace/gdal.xml_ kopiert, wenn GDAL genutzt wird (siehe <<installation-gdal>> und <<konfiguration-gdal>>) - ** _<BACKUP_CONFIG>/xplansyn-wms-workspace/services/html.gfi_ kopiert - ** _<BACKUP_CONFIG>/xplansyn-wms-workspace/data/_ zurückkopiert - ** _<BACKUP_CONFIG>/xplansyn-wms-workspace/datasources/tile_ zurückkopiert - ** _<BACKUP_CONFIG>/xplansyn-wms-workspace/layers/_ alle Layer, die mit einer Zahl beginnen, zurückkopiert - ** _<BACKUP_CONFIG>/xplansyn-wms-workspace/themes/*raster.xml_ (alle Dateien die auf _raster.xml_ enden) zurückkopiert +* [ ] Konfiguration im Verzeichnis _<DEEGREE_WORKSPACE_ROOT>/xplan-services-wms-workspace/_ aktualisiert: + ** _<BACKUP_CONFIG>/xplan-services-wms-workspace/jdbc/_ kopiert + ** _<BACKUP_CONFIG>/xplan-services-wms-workspace/gdal.xml_ kopiert, wenn GDAL genutzt wird (siehe <<installation-gdal>> und <<konfiguration-gdal>>) + ** _<BACKUP_CONFIG>/xplan-services-wms-workspace/services/html.gfi_ kopiert + ** _<BACKUP_CONFIG>/xplan-services-wms-workspace/data/_ zurückkopiert + ** _<BACKUP_CONFIG>/xplan-services-wms-workspace/datasources/tile_ zurückkopiert + ** _<BACKUP_CONFIG>/xplan-services-wms-workspace/layers/_ alle Layer, die mit einer Zahl beginnen, zurückkopiert + ** _<BACKUP_CONFIG>/xplan-services-wms-workspace/themes/*raster.xml_ (alle Dateien die auf _raster.xml_ enden) zurückkopiert NOTE: Weitere Hinweise zu der Verzeichnisstruktur und der Ablage von Rasterdateien sind im Anhang <<appendix_xplanwms-workspace>> zu finden. ==== Checkliste für XPlanWFS Workspace Konfiguration -* [ ] Konfiguration im Verzeichnis _<DEEGREE_WORKSPACE_ROOT>/xplan-wfs-workspace/_ aktualisiert: - ** _<BACKUP_CONFIG>/xplan-wfs-workspace/jdbc/_ kopiert +* [ ] Konfiguration im Verzeichnis _<DEEGREE_WORKSPACE_ROOT>/xplan-services-wfs-workspace/_ aktualisiert: + ** _<BACKUP_CONFIG>/xplan-services-wfs-workspace/jdbc/_ kopiert ==== Checkliste für XPlanInspirePluWFS und XPlanInspirePluWMS Workspace Konfiguration -* [ ] Konfiguration im Verzeichnis _<XPLANBOX_CONFIG>/xplan-inspireplu-workspace/_ aktualisiert: - ** _<BACKUP_CONFIG>/xplan-inspireplu-workspace/jdbc/_ kopiert +* [ ] Konfiguration im Verzeichnis _<XPLANBOX_CONFIG>/xplan-webservices-inspireplu-workspace/_ aktualisiert: + ** _<BACKUP_CONFIG>/xplan-webservices-inspireplu-workspace/jdbc/_ kopiert === Checkliste für Aktualisierung der Datenbank diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/anhang/xplanwms.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/anhang/xplanwms.adoc index e3c64932a8aae85650151ff8f27a128a7e76bf6d..e39fcbb16995e2d86362c0e02cb5bdf4d4a683c5 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/anhang/xplanwms.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/anhang/xplanwms.adoc @@ -2,7 +2,7 @@ [[appendix_xplanwms-workspace]] == XPlanWMS Workspace -Der Workspace _xplansyn-wms-workspace_ wird durch den XPlanManager verwaltet. Werden XPlanArchive mit Rasterdaten über den XPlanManager importiert, dann werden die Rasterdateien im Dateisystem abgespeichert und entsprechende Konfigurationsdateien erzeugt bzw. erweitert. +Der Workspace _xplan-services-wms-workspace_ wird durch den XPlanManager verwaltet. Werden XPlanArchive mit Rasterdaten über den XPlanManager importiert, dann werden die Rasterdateien im Dateisystem abgespeichert und entsprechende Konfigurationsdateien erzeugt bzw. erweitert. Die folgende Übersicht der Verzeichnisstruktur und der darin enthaltenen Dateien erläutert, wo die Rasterdateien abgelegt und die entsprechenden Konfigurationsdateien generiert werden. Dies sind die mit den Ziffern <2>, <3>, <4>, <7> und <13> markierten Verzeichnisse. ---- diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/bekannteProbleme.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/bekannteProbleme.adoc index e7b1fefdf82c4c7e3934bc61c0fef42a7a8b03a2..2a7bf356303b4f9b42aaccd50b731869c19d429e 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/bekannteProbleme.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/bekannteProbleme.adoc @@ -48,7 +48,7 @@ Tritt bei Aufruf des XPlanManagerCLI der Fehler `java.lang.UnsatisfiedLinkError: ==== Lösungsansätze -* Ist das Rasterdatenformat *GeoTIFF* für die Datenhaltung des XPlanWMS über den Eintrag `rasterConfigurationType=geotiff` konfiguriert, müssen folgenden Dateien aus dem _<DEEGREE_WORKSPACE_ROOT>/xplansyn-wms-workspace/_ gelöscht werden: +* Ist das Rasterdatenformat *GeoTIFF* für die Datenhaltung des XPlanWMS über den Eintrag `rasterConfigurationType=geotiff` konfiguriert, müssen folgenden Dateien aus dem _<DEEGREE_WORKSPACE_ROOT>/xplan-services-wms-workspace/_ gelöscht werden: ** _datasources/tile/dummy.ignore_ ** _datasources/tile/tilematrixset/dummy.ignore_ diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/datenbank.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/datenbank.adoc index 7ed9fff4a1f8b45314fea35b2c508d2fd1e84a32..f9a571e02736922a7634479848d01b7d05cc28a2 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/datenbank.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/datenbank.adoc @@ -24,11 +24,11 @@ CREATE EXTENSION IF NOT EXISTS postgis; - Das SQL-Skript _create.sql_ aus dem Verzeichnis _xplan-manager-workspace/sql_ in der neu angelegten Datenbank in der Rolle `$DB_INIT_USER` ausführen. - Anpassen der Datenbank-Verbindungen in den XPlanDiensten und im XPlanManagerWorkspace unter Verwendung der Rolle `$DB_USER`: .. _<DEEGREE_WORKSPACE_ROOT>/xplan-manager-workspace/jdbc/xplan.xml_ - .. _<DEEGREE_WORKSPACE_ROOT>/xplan-wfs-workspace/jdbc/xplan.xml_ - .. _<DEEGREE_WORKSPACE_ROOT>/xplansyn-wfs-workspace/jdbc/xplan.xml_ - .. _<DEEGREE_WORKSPACE_ROOT>/xplansyn-wms-workspace/jdbc/xplan.xml_ + .. _<DEEGREE_WORKSPACE_ROOT>/xplan-services-wfs-workspace/jdbc/xplan.xml_ + .. _<DEEGREE_WORKSPACE_ROOT>/xplan-services-wfs-syn-workspace/jdbc/xplan.xml_ + .. _<DEEGREE_WORKSPACE_ROOT>/xplan-services-wms-workspace/jdbc/xplan.xml_ . Anpassen der Datenbank-Verbindungen im XPlanValidatorWMS, wenn die persistente Datenhaltung verwendet wird (siehe <<konfiguration-xplanvalidatorwms>>) -.. _<DEEGREE_WORKSPACE_ROOT>/xplan-validator-wms-sql-workspace/jdbc/xplan.xml_ +.. _<DEEGREE_WORKSPACE_ROOT>/xplan-webservices-validator-wms-sql-workspace/jdbc/xplan.xml_ NOTE: Weitere Informationen zu der Erstellung der XPlanDB im Anhang <<appendix_xplandb_skript>>. @@ -43,7 +43,7 @@ Es müssen die folgenden Schritte ausgeführt werden: .. _01_create_inspireplu_schema.sql_ .. _02_create_inspireplu_view.sql_ . Anpassen der Datenbank-Verbindungen in den XPlanDiensten und im XPlanManagerWorkspace: - .. _<DEEGREE_WORKSPACE_ROOT>/xplan-inspireplu-workspace/jdbc/inspireplu.xml_ + .. _<DEEGREE_WORKSPACE_ROOT>/xplan-webservices-inspireplu-workspace/jdbc/inspireplu.xml_ .. _<DEEGREE_WORKSPACE_ROOT>/xplan-manager-workspace/jdbc/inspireplu.xml_ ==== Weiterführende Informationen zur Konfiguration des Datenbankzugriffs diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/gdal.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/gdal.adoc index ceab6cf0b2c07d7374bea3955115fa60555a0ada..fd9d4f11932c939de3e830ffe952d4771e0756e2 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/gdal.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/gdal.adoc @@ -6,7 +6,7 @@ Die GDAL-Unterstützung ist optional, die Konfiguration im XPlanManagerWeb und X Es muss die GDAL-Bibliothek und die dazugehörige JNI-Schnittstelle installiert werden. -IMPORTANT: Der Zugriff auf die GDAL-Bibliothek erfolgt über die Schnittstelle Java Native Interface (JNI). Je JVM kann die GDAL-Bibliothek nur einmal geladen werden. Deswegen muss jede Webapp der xPlanBox, die GDAL verwendet (`xplan-wms` und `xplan-manager-web`), in einer separaten Tomcat-Instanz installiert werden. +IMPORTANT: Der Zugriff auf die GDAL-Bibliothek erfolgt über die Schnittstelle Java Native Interface (JNI). Je JVM kann die GDAL-Bibliothek nur einmal geladen werden. Deswegen muss jede Webapp der xPlanBox, die GDAL verwendet wie z.B. XPlanWMS und XPlanManagerWeb, in einer separaten Tomcat-Instanz installiert werden. [[installation-gdal-linux]] ==== Linux 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 8e3620e80f66d5742b741f886b9c3cfe9c224eec..fd485a6a041b007c21953842559c5e21cf106f01 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/installation.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/installation.adoc @@ -8,17 +8,18 @@ Speichern Sie die Distributionsdatei in einem lokalen Verzeichnis und entpacken Die ZIP-Archive mit den deegree Workspaces (s. <<installationskomponenten>>) müssen in das Verzeichnis _<DEEGREE_WORKSPACE_ROOT>_ (s. <<vorbereitung-der-installation>>) entpackt werden: -* _xplan-wfs-workspace_ -* _xplansyn-wfs-workspace_ -* _xplansyn-wms-workspace_ -* _xplan-validator-wms-memory-workspace_ *oder* _xplan-validator-wms-sql-workspace_ (siehe <<konfiguration-xplanvalidatorwms>>) -* _xplan-manager-workspace_ -* _xplan-inspireplu-workspace_ (optional) +* _xplan-manager-workspace.zip_ +* _xplan-services-wfs-workspace.zip_ +* _xplan-services-wfs-syn-workspace.zip_ +* _xplan-services-wms-workspace.zip_ +* _xplan-webservices-validator-wms-memory-workspace.zip_ *oder* _xplan-webservices-validator-wms-sql-workspace.zip_ (siehe <<konfiguration-xplanvalidatorwms>>) +* _xplan-webservices-inspireplu-workspace.zip_ (optional) Die ZIP-Archive mit den Konfigurationen für die XPlanManager und XPlanValidator (s. <<installationskomponenten>>) müssen in das Verzeichnis _<XPLANBOX_CONFIG>_ (s. <<vorbereitung-der-installation>>) entpackt werden: -* _xplan-manager-config_ -* _xplan-validator-config_ (nur erforderlich, wenn ausschließlich der XPlanValidator installiert werden soll) +* _xplan-manager-config-default.zip_ +* _xplan-validator-config.zip_ (nur erforderlich, wenn ausschließlich der XPlanValidator installiert werden soll) +* _xplan-dokumente-config.zip_ (optional) [[web-anwendungen]] ==== Web-Anwendungen @@ -32,25 +33,24 @@ betrieben werden. Im Folgenden ist beschrieben, wie eine Installation der Kompon Die folgenden WAR-Archive (s. <<installationskomponenten>>) müssen in das Verzeichnis _<CATALINA_HOME>/webapps_ der Tomcat-Instanz _Dienste-Tomcat_ (z. B. auf Port: 8080) kopiert werden: -* _xplan-wms.war_ (XPlanWMS und XPlanWerkWMS) -* _xplan-wfs.war_ (XPlanWFS) -* _xplansyn-wfs.war_ (XPlanSynWFS) -* _xplan-inspireplu.war_ (XPlanInspirePluWMS und XPlanInspirePluWFS) (optional) -* _xplan-validator-wms.war_ (XPlanValidatorWMS) +* _xplan-services-wfs.war_ (XPlanWFS) +* _xplan-services-wfs-syn.war_ (XPlanSynWFS) +* _xplan-services-wms.war_ (XPlanWMS und XPlanWerkWMS) +* _xplan-webservices-inspireplu.war_ (XPlanInspirePluWMS und XPlanInspirePluWFS) (optional) +* _xplan-webservices-validator-wms.war_ (XPlanValidatorWMS) -Die WAR-Archive der Anwendungskomponenten XPlanManagerWeb und XPlanValidatorWeb werden über eine -weitere Tomcat-Instanz _Anwendungs-Tomcat_ (z. B. auf Port: 8081) bereitgestellt: +Die WAR-Archive der Anwendungskomponenten XPlanManagerWeb und XPlanValidatorWeb werden über eine weitere Tomcat-Instanz _Anwendungs-Tomcat_ (z. B. auf Port: 8081) bereitgestellt: * _xplan-manager-web.war_ (XPlanManagerWeb) * _xplan-validator-web.war_ (XPlanValidatorWeb) -* _xplan-root.war_ (XPlanRessourcen) +* _xplan-webpages-default.war_ (XPlanRessourcen) Die WAR-Archive der REST-API werden über eine weitere Tomcat-Instanz _API-Tomcat_ (z. B. auf Port: 8082) bereitgestellt: -* _xplan-api-manager.war_ (XPlanManagerAPI) -* _xplan-api-validator.war_ (XPlanValidatorAPI) +* _xplan-manager-api.war_ (XPlanManagerAPI) +* _xplan-validator-api.war_ (XPlanValidatorAPI) -TIP: Da die Komponente XPlanRessourcen eine Einstiegsseite bereitstellt, bietet es sich an, diese als ROOT-Webapp der Instanz _Anwendungs-Tomcat_ zu installieren. Das WAR-Archiv _xplan-root.war_ muss dafür im Verzeichnis _ROOT_ entpackt werden. +TIP: Da die Komponente XPlanRessourcen eine Einstiegsseite bereitstellt, bietet es sich an, diese als ROOT-Webapp der Instanz _Anwendungs-Tomcat_ zu installieren. Das WAR-Archiv _xplan-webpages-default.war_ muss dafür im Verzeichnis _ROOT_ entpackt werden. ==== Verknüpfung von Webapp und Workspace @@ -60,11 +60,11 @@ Diese enthält die Verknüpfung zwischen der Webapp und dem Workspace. .Beispiel für _webapps.properties_ für den _Dienste-Tomcat_: [source,properties] ---- -/xplan-wms=xplansyn-wms-workspace -/xplansyn-wfs=xplansyn-wfs-workspace -/xplan-wfs=xplan-wfs-workspace -/xplan-validator-wms=xplan-validator-wms-sql-workspace -/xplan-inspireplu=xplan-inspireplu-workspace +/xplan-services-wms=xplan-services-wms-workspace +/xplan-services-wfs-syn=xplan-services-wfs-syn-workspace +/xplan-services-wfs=xplan-services-wfs-workspace +/xplan-webservices-validator-wms=xplan-webservices-validator-wms-sql-workspace +/xplan-webservices-inspireplu=xplan-webservices-inspireplu-workspace ---- Weitere Informationen zur Konfiguration des XPlanValidatorWMS sind im Kapitel <<konfiguration-xplanvalidatorwms>> zu finden. diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/konfigurationApplikationsserver.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/konfigurationApplikationsserver.adoc index 75727bbf89664abf6ac888c7a5e93e196e8cfa54..5edd6dbe39914e63fafd419c1d0dc3d39d033ae6 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/konfigurationApplikationsserver.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/konfigurationApplikationsserver.adoc @@ -91,12 +91,12 @@ Wenn die xPlanBox in einer produktiven Umgebung betrieben wird, sollte der Apach Zusätzlich sollte die xPlanBox wie folgt konfiguriert sein: -. die deegree webservice console (Kontextpfad _/console_) für die Dienste _xplan-wms_, _xplan-wfs_, _xplansyn-wfs_ und _xplan-inspireplu_ im _Dienste-Tomcat_ ist durch ein Kennwort geschützt (Datei _console.pw_ im deegree Workspace). -. die deegree REST-Schnittstelle (Kontextpfad _/config_) für die Dienste _xplan-wms_, _xplan-wfs_, _xplansyn-wfs_ und _xplan-inspireplu_ ist durch einen API-Key abgesichert (Datei _config.apikey_ im Workspace-Verzeichnis, siehe Kapitel <<dienste-tomcat>>). +. die deegree webservice console (Kontextpfad _/console_) für die Dienste _xplan-services-wms_, _xplan-services-wfs_, _xplan-services-wfs-syn_ und _xplan-webservices-inspireplu_ im _Dienste-Tomcat_ ist durch ein Kennwort geschützt (Datei _console.pw_ im deegree Workspace). +. die deegree REST-Schnittstelle (Kontextpfad _/config_) für die Dienste _xplan-services-wms_, _xplan-services-wfs_, _xplan-services-wfs-syn_ und _xplan-webservices-inspireplu_ ist durch einen API-Key abgesichert (Datei _config.apikey_ im Workspace-Verzeichnis, siehe Kapitel <<dienste-tomcat>>). . zusätzlich wird die Einschränkung des Zugriffs auf die deegree webservice console und deegree REST-Schnittstelle auf IP-Adressbereiche bzw. Domänen empfohlen (Datei _context.xml_ innerhalb der Webanwendungen). . die Tomcat-Instanzen werden hinter einem Proxy (z. B. Apache httpd oder nginx) betrieben. . der Zugriff auf den XPlanManagerWeb ist durch Benutzername und Kennwort abgesichert (siehe Kapitel <<security>>). . die Komponente XPlanManagerAPI ist ebenfalls über Benutzername und Kennwort abgesichert. -. die über den XPlanManagerAPI/Web sowie XPlanValidatorAPI/Web hochgeladenen Dateien sollten vorher durch einen Proxy mit Virenscanner auf Viren und Malware geprüft werden. +. die über den XPlanManagerAPI/-Web sowie XPlanValidatorAPI/-Web hochgeladenen Dateien sollten vorher durch einen Proxy mit Virenscanner auf Viren und Malware geprüft werden. CAUTION: Der Betrieb der xPlanBox *ohne* die Umsetzung dieser Maßnahmen kann die IT-Sicherheit der Anwendung gefährden! \ No newline at end of file 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 878fe52f716f9eb2bcb0a8e3ae2f4499a32fd0dd..ec724032531c326e4b323d4091f769c5d81265a9 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/ueberblick.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/installation/ueberblick.adoc @@ -4,37 +4,38 @@ Die xPlanBox umfasst die folgenden Komponenten, die zusammengenommen die Liefereinheit darstellen: * Kommandozeilenwerkzeuge: - ** xplan-manager-cli-<VERSION>.zip - ** xplan-validator-cli-<VERSION>.zip - ** xplan-transform-cli-<VERSION>.zip - ** xplan-validatedb-cli-<VERSION>.zip - ** xplan-evaluation-schema-synchronize-cli-<VERSION>.zip - ** xplan-update-data-cli-<VERSION>.zip + ** xplan-evaluation-schema-synchronize-cli.zip + ** xplan-manager-cli.zip + ** xplan-transform-cli.zip + ** xplan-update-data-cli.zip + ** xplan-validatedb-cli.zip + ** xplan-validator-cli.zip * Web-Anwendungen und Web-Dienste und zugehörige Konfigurationen: [width="100%",cols="40%,60%",options="header"] |=== |*Web-Anwendung/Dienst* |*Konfigurationen* -|xplan-root-<VERSION>.war |- -|xplan-validator-web-<VERSION>.war |xplan-validator-config-<VERSION>.zip -|xplan-manager-web-<VERSION>.war |xplan-manager-config-<VERSION>.zip und xplan-workspaces-<VERSION>-xplan-manager-workspace.zip -|xplan-api-validator-<VERSION>.war |xplan-validator-config-<VERSION>.zip -|xplan-api-manager-<VERSION>.war |xplan-manager-config-<VERSION>.zip und xplan-workspaces-<VERSION>-xplan-manager-workspace.zip -|xplansyn-wfs-<VERSION>.war |xplan-workspaces-<VERSION>-xplansyn-wfs-workspace.zip -|xplan-wfs-<VERSION>.war |xplan-workspaces-<VERSION>-xplan-wfs-workspace.zip -|xplan-wms-<VERSION>.war |xplan-workspaces-<VERSION>-xplansyn-wms-workspace.zip -|xplan-inspireplu-<VERSION>.war |xplan-workspaces-<VERSION>-xplan-inspireplu-workspace.zip -|xplan-validator-wms-<VERSION>.war |xplan-workspaces-<VERSION>-xplan-validator-wms-memory-workspace.zip, xplan-workspaces-<VERSION>-xplan-validator-wms-sql-workspace.zip +|xplan-dokumente-api.war |xplan-dokumente-config.zip +|xplan-manager-web.war |xplan-manager-config-default.zip, xplan-manager-workspace.zip +|xplan-manager-api.war |xplan-manager-config-default.zip, xplan-manager-workspace.zip +|xplan-services-wfs-syn.war |xplan-services-wfs-syn-workspace.zip +|xplan-services-wfs.war |xplan-services-wfs-workspace.zip +|xplan-services-wms.war |xplan-services-wms-workspace.zip +|xplan-validator-web.war |xplan-validator-config.zip +|xplan-validator-api.war |xplan-validator-config.zip +|xplan-webpages-default.war |- +|xplan-webservices-inspireplu.war |xplan-webservices-inspireplu-workspace.zip +|xplan-webservices-validator-wms.war |xplan-webservices-validator-wms-memory-workspace.zip, xplan-webservices-validator-wms-sql-workspace.zip |=== * MapServer Konfiguration - ** xplan-mapserver-config-<VERSION>.zip + ** xplan-mapserver-config.zip * MapProxy Konfiguration - ** xplan-mapproxy-config-<VERSION>.zip + ** xplan-mapproxy-config.zip -* Dokumentation (in HTML und PDF-Format): - ** XPlanBenutzerhandbuch - Benutzerhandbuch für die Komponenten der xPlanBox - ** XPlanBetriebshandbuch - Betriebshandbuch und Installationsanleitung für die xPlanBox +* Dokumentation : + ** xplan-benutzerhandbuch-<html|pdf>.zip - XPlanBenutzerhandbuch - Benutzerhandbuch für die Komponenten der xPlanBox in HTML und PDF-Format + ** xplan-betriebshandbuch-<html|pdf>.zip - XPlanBetriebshandbuch - Betriebshandbuch und Installationsanleitung für die xPlanBox in HTML und PDF-Format NOTE: Stellen Sie vor Beginn der Installation sicher, dass die Distributionsdatei vollständig ist. Bitte kontaktieren Sie https://www.lat-lon.de[lat/lon GmbH], per E-Mail an info@lat-lon.de, wenn Installationskomponenten fehlen. \ No newline at end of file diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/dienste/html_gfi.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/dienste/html_gfi.adoc index a7dc51577308cdac64bfe6bd8140cf8764959a8e..4ef3be806a0c8b43b39157800838687174210c9a 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/dienste/html_gfi.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/dienste/html_gfi.adoc @@ -1,6 +1,6 @@ [[konfiguration-xplanwms-gfi]] === HTML-Template für XPlanWMS GFI -Nach der Installation ist in der Datei _html.gfi_ im Verzeichnis _<DEEGREE_WORKSPACE_ROOT>/xplansyn-wms-workspace/services_ die Anpassung der URL des XPlanWMS vorzunehmen. +Nach der Installation ist in der Datei _html.gfi_ im Verzeichnis _<DEEGREE_WORKSPACE_ROOT>/xplan-services-wms-workspace/services_ die Anpassung der URL des XPlanWMS vorzunehmen. Damit Links auf Dokumente in der WMS GetFeatureInfo (GFI) Ausgabe auch bei externen Aufrufen funktionsfähig sind, muss eine Anpassung der URL in der Datei _html.gfi_ @@ -8,7 +8,7 @@ erfolgen. Die URL der Variable `WMS_URL` muss auf die öffentliche URL des XPlan Vorgabewert in der Datei _html.gfi_: ---- -var WMS_URL = "http://localhost:8080/xplan-wms"; +var WMS_URL = "http://localhost:8080/xplan-services-wms"; ---- Eine Übersicht der weiteren Konfigurationsdateien des XPlanWMS ist im Anhang <<appendix_xplanwms-workspace>> zu finden. diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/dienste/mapserver.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/dienste/mapserver.adoc index 2be448c62df728ab879f86130c2f9c0f42ebabac..a6b7892930ae7a1791d6d8a0053e2efd8bf7fea0 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/dienste/mapserver.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/dienste/mapserver.adoc @@ -3,7 +3,7 @@ Der MapServer kann für die Bereitstellung von Rasterdaten alternativ zum XPlanWMS auf Basis eines deegreeWMS verwendet werden. Um den MapServer als RemoteWMS im XPlanWMS zu konfigurieren, müssen folgenden Anpassungen vorgenommen werden: -* Im Workspace Verzeichnis _xplansyn-wms-workspace_ müssen in den Unterverzeichnissen _layers/_ und _datasources/remoteows/_ die Dateien _mapserver.ignore_ auf _mapserver.xml_ umbenannt werden. +* Im Workspace Verzeichnis _xplan-services-wms-workspace_ müssen in den Unterverzeichnissen _layers/_ und _datasources/remoteows/_ die Dateien _mapserver.ignore_ auf _mapserver.xml_ umbenannt werden. * In der Datei _datasources/remoteows/mapserver.xml_ muss die URL des MapServer eingetragen werden. * Zusätzlich müssen im Verzeichnis _themes/_ in allen _*raster.xml_ Dateien der LayerStore auf _mapserver_ geändert werden. diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/daten-dienste-kopplung.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/daten-dienste-kopplung.adoc index 39733a0f0bc07bfab7e6b049eb991e85697a2bd0..723df4b843a612a3388e211399fdb46b11b3896a 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/daten-dienste-kopplung.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/daten-dienste-kopplung.adoc @@ -26,7 +26,7 @@ directoryToStoreMetadata=/tmp/ Erläuterung der einzelnen Properties: - * *planWerkWmsBaseUrl*: Die öffentliche Basis-URL des XPlanWerkWMS, z. B. http://xplanbox.lat-lon.de/xplan-wms/ + * *planWerkWmsBaseUrl*: Die öffentliche Basis-URL des XPlanWerkWMS, z. B. http://xplanbox.lat-lon.de/xplan-services-wms/ * *planWerkWmsGetMapLayers_BP_Plan* und *planWerkWmsGetMapStyles_BP_Plan*: Angabe der zu verwendenen Layer und Styles, die in der GetMap Anfrage (GraphicOverview) angegeben werden sollen * *planWerkWmsGetMapWidth* und *planWerkWmsGetMapHeight*: Angabe der zu verwendenden Höhe und Breite des Kartenbildes in Pixeln, die in der GetMap Anfrage (GraphicOverview) angegeben werden sollen * *cswUrlProvidingDatasetMetadata*: GetCapabilities URL des CSW, der Daten-Metadatensätze zu einem Plan bereitstellt diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/externeReferenzen.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/externeReferenzen.adoc index afb2e6138c5905d6830c29e2e77302dceb66d91a..c2733afba8030665db6e6c9d696d532732631713 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/externeReferenzen.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/externeReferenzen.adoc @@ -6,7 +6,7 @@ Um im XPlanManager den Austausch der relativen URLs in absolute URLs für den di .Beispiel für die Verwendung der XPlanDokumentenAPI [source,properties] ---- -XPLAN_DOCUMENT_URL_PUBLIC=http://<host>:<port>/xplan-api-dokumente/xdokumente/api/v1/dokument/{planId}/{fileName} +XPLAN_DOCUMENT_URL_PUBLIC=http://<host>:<port>/xplan-dokumente-api/xdokumente/api/v1/dokument/{planId}/{fileName} ---- .Beispiel für die Verwendung der S3-API diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/gdal.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/gdal.adoc index d245656fe4d4a859c2de65015c4bc9141c001254..4fff65e83fa41fdd81153d3549dfe05185439857 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/gdal.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/gdal.adoc @@ -4,7 +4,7 @@ Um im XPlanManger die GDAL-Unterstützung zu aktivieren, muss vorher die <<installation-gdal,Installation>> von GDAL erfolgt sein. Um die GDAL-Unterstützung in deegree zu aktivieren, muss die -GDAL-Konfigurationsdatei erzeugt werden. Dazu muss im Workspace-Verzeichnis _<DEEGREE_WORKSPACE_ROOT>/xplansyn-wms-workspace_ eine Datei mit dem Namen _gdal.xml_ und mit folgendem Inhalt vorhanden sein: +GDAL-Konfigurationsdatei erzeugt werden. Dazu muss im Workspace-Verzeichnis _<DEEGREE_WORKSPACE_ROOT>/xplan-services-wms-workspace_ eine Datei mit dem Namen _gdal.xml_ und mit folgendem Inhalt vorhanden sein: [source,xml] ---- @@ -26,7 +26,7 @@ muss zusätzlich in der Datei _<XPLANBOX_CONFIG>/managerConfiguration.properties rasterConfigurationType=gdal ---- -Der _xplansyn-wms-workspace_ wird mit einer Dummy-Konfiguration eines GDAL-Rasterlayers ausgeliefert. Liegen zunächst keine Daten vor, kann dieser aktiviert werden, um Fehler nach dem ersten Import eines Plans mit Rasterdaten zu vermeiden. Dazu muss in den Theme-Konfigurationen unter _themes_ in allen Dateien, die mit _raster.xml_ enden, die folgende Zeile auskommentiert werden: +Der _xplan-services-wms-workspace_ wird mit einer Dummy-Konfiguration eines GDAL-Rasterlayers ausgeliefert. Liegen zunächst keine Daten vor, kann dieser aktiviert werden, um Fehler nach dem ersten Import eines Plans mit Rasterdaten zu vermeiden. Dazu muss in den Theme-Konfigurationen unter _themes_ in allen Dateien, die mit _raster.xml_ enden, die folgende Zeile auskommentiert werden: [source,xml] ---- <Layer layerStore="dummyrasterlayer">dummyraster</Layer> diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/gueltigkeitszeitraum.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/gueltigkeitszeitraum.adoc index bba2de632c7ffac3ccc20ca2956ab34ae6b5be83..d43a95f36ec8f06bdd405338e73cdc42fc504b45 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/gueltigkeitszeitraum.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/gueltigkeitszeitraum.adoc @@ -10,7 +10,7 @@ activateValidityPeriodDialog=[true|false] Weiterhin muss die Auswertung des Gültigkeitszeitraums für Rasterdaten im XPlanWMSInAufstellung konfiguriert sein. Andernfalls werden die im Plan referenzierten Rasterdaten grundsätzlich angezeigt. Diese Option ist für den XPlanWMSInAufstellung implementiert und standardmäßig konfiguriert. Bei den anderen beiden Endpunkten (XPlanWMSFestgestellt und XPlanWMSArchiviert) erfolgt keine Auswertung des Gültigkeitszeitraums für Rasterdaten. -Dazu ist folgender Abschnitt in der Datei _<DEEGREE_WORKSPACE_ROOT>/xplansyn-wms-workspace/wmspre.xml_ vorhanden. Bei Bedarf kann dieser entfernt werden, wodurch auch für den XPlanWMSInAufstellung keine Auswertung des Gültigkeitszeitraums für Rasterdaten erfolgt. Anschließend ist ein Neustart des Applikationsservers erforderlich. +Dazu ist folgender Abschnitt in der Datei _<DEEGREE_WORKSPACE_ROOT>/xplan-services-wms-workspace/wmspre.xml_ vorhanden. Bei Bedarf kann dieser entfernt werden, wodurch auch für den XPlanWMSInAufstellung keine Auswertung des Gültigkeitszeitraums für Rasterdaten erfolgt. Anschließend ist ein Neustart des Applikationsservers erforderlich. .Auszug aus der Datei _wmspre.xml_ [source,xml] diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/kartenvorschau.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/kartenvorschau.adoc index 5267a01b82132463302e55aa718608d27a5f29cd..b864da423f8e69237f05443271281ce046dc8b79 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/kartenvorschau.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/kartenvorschau.adoc @@ -11,9 +11,9 @@ Um den XPlanWMS im XPlanManagerWeb für die Kartenvorschau zu konfigurieren, mus _Beispiel der Konfiguration des XPlanWMS für die Kartenvorschau:_ ---- -wmsUrl=http://<host>:<port>/xplan-wms/services -vectorWmsName=XPlan-WMS: Vektorkarten -rasterWmsName=XPlan-WMS: Rasterkarten +wmsUrl=http://<host>:<port>/xplan-services-wms/services +vectorWmsName=xplan-services-wms: Vektorkarten +rasterWmsName=xplan-services-wms: Rasterkarten wmsEndpoint=wms wmsPreEndpoint=wmspre wmsArchiveEndpoint=wmsarchive diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/workspacereload.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/workspacereload.adoc index ae603133852f12c6f43fb6f6676a2ae0a82ae5e1..06daece73d3ec7511e1d845d2e6529bfac5adb7e 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/workspacereload.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/manager/workspacereload.adoc @@ -22,7 +22,7 @@ workspaceReloadAction=[ALL,RELOAD,PLANWERKWMS] <3> .Beispiel für mehrere URLs für das Element `workspaceReloadUrls`: [source,properties] ---- -workspaceReloadUrls=http://server1/xplan-wms/,http://server2:8081/xplan-wms/ +workspaceReloadUrls=http://server1/xplan-services-wms/,http://server2:8081/xplan-services-wms/ ---- CAUTION: *Wichtig*! Alle Dienste müssen über den gleichen API-Key aufgerufen werden können. diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/rest-api/main.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/rest-api/main.adoc index ac332a0c0868f730b990980e9ac4bd2806baffa1..8d81b026f44a925a422891840b3a23e0e500cd4d 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/rest-api/main.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/rest-api/main.adoc @@ -55,7 +55,7 @@ URL des XPlanwerkWMS, über den einzelne Pläne über die ManagerID angefragt we Beispiel: ---- -wmsUrl=http://xplanbox.lat-lon.de/xplan-wms +wmsUrl=http://xplanbox.lat-lon.de/xplan-services-wms ---- ==== Standard-Validierungseinstellungen diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/validator/kartenvorschau.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/validator/kartenvorschau.adoc index e0e37f73e2e691f0cfa187fa519be3645a56b75f..d08bde4d13422f1659e17b4bd26ab1f27ca51d58 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/validator/kartenvorschau.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/konfiguration/validator/kartenvorschau.adoc @@ -6,7 +6,7 @@ Die nachfolgende Konfiguration muss in der Datei _<XPLANBOX_CONFIG>/validatorCon Um die Kartenvorschau im XPlanValidatorWeb zu aktivieren, muss die URL des XPlanValidatorWMS konfiguriert werden: ---- -validatorWmsEndpoint=http://<host>:<port>>/xplan-validator-wms/services/wms +validatorWmsEndpoint=http://<host>:<port>>/xplan-webservices-validator-wms/services/wms ---- Um die Hintergrundkarte der Kartenvorschau anzupassen, ist die Anpassung einer Datei im _xplan-validator-web.war_ erforderlich. @@ -34,14 +34,14 @@ NOTE: Die Zeilen mit den Angaben für `${SERVICESCONFIG}`, `id` und `name` dürf Im XPlanValidatorWMS werden die im XPlanValidator hochgeladenen XPlanGML-Dateien visualisiert und über die Kartenvorschau im XPlanValidatorWeb angezeigt. Der XPlanValidatorWMS kann für die temporäre Datenhaltung so konfiguriert werden, dass die Daten ausschliesslich im Arbeitsspeicher vorgehalten oder in einer Datenbank gespeichert werden. -Über den _xplan-validator-wms-memory-workspace_ (dies ist der Vorgabewert) steht eine Konfiguration für den XPlanValidatorWMS bereit, die die Daten ausschliesslich im Arbeitsspeicher vorhält. Mit dem _xplan-validator-wms-sql-workspace_ kann stattdessen die XPlanDB als Datenhaltung ausgewählt werden. Dabei muss ein separates Schema für den XPlanValidatorWMS in der XPlanDB angelegt werden (weitere Informationen zur Einrichtung der XPlanDB im Kapitel <<konfiguration-der-datenbank>>). +Über den _xplan-webservices-validator-wms-memory-workspace_ (dies ist der Vorgabewert) steht eine Konfiguration für den XPlanValidatorWMS bereit, die die Daten ausschliesslich im Arbeitsspeicher vorhält. Mit dem _xplan-validator-wms-sql-workspace_ kann stattdessen die XPlanDB als Datenhaltung ausgewählt werden. Dabei muss ein separates Schema für den XPlanValidatorWMS in der XPlanDB angelegt werden (weitere Informationen zur Einrichtung der XPlanDB im Kapitel <<konfiguration-der-datenbank>>). Die Aktivierung des jeweiligen Workspace erfolgt über die Datei _<DEEGREE_WORKSPACE_ROOT>/webapps.properties_. .Beispiel für den Eintrag in der _webapps.properties_ mit der Auswahl der XPlanDB als Datenhaltung für den XPlanValidatorWMS: [source,properties] ---- -/xplan-validator-wms=xplan-validator-wms-sql-workspace +/xplan-webservices-validator-wms=xplan-webservices-validator-wms-sql-workspace ---- [IMPORTANT] diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/migration.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/migration.adoc index 2de6bbd1384ed293b38cd4e66221b4ac8018496e..5d306f1bcbb5f25a945b8b6517e43a1790f22b8e 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/migration.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/migration.adoc @@ -16,7 +16,7 @@ Kartenvorschau im XPlanManager funktioniert. Dazu muss der Wert des Schlüssels `wmsUrl` angepasst werden: ---- -wmsUrl=http://<host>:<port>/xplan-wms/services +wmsUrl=http://<host>:<port>/xplan-services-wms/services ---- Für mehr Details siehe Kapitel <<kartenvorschau>>. @@ -41,7 +41,7 @@ kommunizieren. [[fuer-den-xplanwms]] ==== Für den XPlanWMS: -* _html.gfi_ (im Verzeichnis _<DEEGREE_WORKSPACE_ROOT>/xplansyn-wms-workspace/services_) +* _html.gfi_ (im Verzeichnis _<DEEGREE_WORKSPACE_ROOT>/xplan-services-wms-workspace/services_) *Anpassungen in der Datei html.gfi:* diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/ressourcen.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/ressourcen.adoc index 0ed7f8c754bc4a2c75bb030534d0828674a30521..61e1686a00f50aca6655fe5e2eedfa621ef63be2 100644 --- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/ressourcen.adoc +++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/ressourcen.adoc @@ -5,14 +5,14 @@ den anderen Komponenten der xPlanBox. Die Referenzen müssen ggf. an die Umgebung der Installation angepasst werden. In der Datei _index.html_ müssen die URLs zu den XPlanDiensten modifiziert werden: -* http://localhost:8080/xplan-wms/services/wms?service=WMS&request=GetCapabilities -* http://localhost:8080/xplansyn-wfs/services/xplansynwfs?service=WFS&request=GetCapabilities -* http://localhost:8080/xplan-wfs/services/wfs40?service=WFS&request=GetCapabilities -* http://localhost:8080/xplan-wfs/services/wfs41?service=WFS&request=GetCapabilities -* http://localhost:8080/xplan-wfs/services/wfs50?service=WFS&request=GetCapabilities -* http://localhost:8080/xplan-wfs/services/wfs51?service=WFS&request=GetCapabilities -* http://localhost:8080/xplan-wfs/services/wfs52?service=WFS&request=GetCapabilities -* http://localhost:8080/xplan-wfs/services/wfs60?service=WFS&request=GetCapabilities +* http://localhost:8080/xplan-services-wms/services/wms?service=WMS&request=GetCapabilities +* http://localhost:8080/xplan-services-wfs-syn/services/xplansynwfs?service=WFS&request=GetCapabilities +* http://localhost:8080/xplan-services-wfs/services/wfs40?service=WFS&request=GetCapabilities +* http://localhost:8080/xplan-services-wfs/services/wfs41?service=WFS&request=GetCapabilities +* http://localhost:8080/xplan-services-wfs/services/wfs50?service=WFS&request=GetCapabilities +* http://localhost:8080/xplan-services-wfs/services/wfs51?service=WFS&request=GetCapabilities +* http://localhost:8080/xplan-services-wfs/services/wfs52?service=WFS&request=GetCapabilities +* http://localhost:8080/xplan-services-wfs/services/wfs60?service=WFS&request=GetCapabilities Weiterhin kann es notwendig sein, die relativ angegeben Referenzen zu den Komponenten XPlanManagerWeb und XPlanValidatorWeb diff --git a/xplan-webapps/xplan-root/.maven-dockerignore b/xplan-documentation/xplan-webpages/.maven-dockerignore similarity index 100% rename from xplan-webapps/xplan-root/.maven-dockerignore rename to xplan-documentation/xplan-webpages/.maven-dockerignore diff --git a/xplan-webapps/xplan-root/Dockerfile b/xplan-documentation/xplan-webpages/Dockerfile similarity index 93% rename from xplan-webapps/xplan-root/Dockerfile rename to xplan-documentation/xplan-webpages/Dockerfile index b2d3abfe2f4d9b576fa969ebe3081eedad1191bc..eeb51f5400050d993fd256d2287210711ea6ba45 100644 --- a/xplan-webapps/xplan-root/Dockerfile +++ b/xplan-documentation/xplan-webpages/Dockerfile @@ -19,4 +19,4 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \ RUN apk add -U tzdata ENV TZ=Europe/Berlin -COPY target/xplan-root-*-default /usr/local/apache2/htdocs/ +COPY target/xplan-webpages-*-default /usr/local/apache2/htdocs/ diff --git a/xplan-webapps/xplan-root/pom.xml b/xplan-documentation/xplan-webpages/pom.xml similarity index 94% rename from xplan-webapps/xplan-root/pom.xml rename to xplan-documentation/xplan-webpages/pom.xml index 31585e766145f23ec5ce2dc2212c0e5b7a829183..0693549f6e378156c45f093c1e286c6cb0d73525 100644 --- a/xplan-webapps/xplan-root/pom.xml +++ b/xplan-documentation/xplan-webpages/pom.xml @@ -1,12 +1,11 @@ <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-root</artifactId> + <artifactId>xplan-webpages</artifactId> <packaging>pom</packaging> - <name>xplan-root</name> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-webapps</artifactId> + <artifactId>xplan-documentation</artifactId> <version>7.2-SNAPSHOT</version> </parent> diff --git a/xplan-webapps/xplan-root/src/main/assembly/assembly-default.xml b/xplan-documentation/xplan-webpages/src/main/assembly/assembly-default.xml similarity index 96% rename from xplan-webapps/xplan-root/src/main/assembly/assembly-default.xml rename to xplan-documentation/xplan-webpages/src/main/assembly/assembly-default.xml index 3921891326ddc9b0fa52dbda6a0dc527ab67410f..7e4ca319d1446eb6ab883738012d1a6caa6b5f5e 100644 --- a/xplan-webapps/xplan-root/src/main/assembly/assembly-default.xml +++ b/xplan-documentation/xplan-webpages/src/main/assembly/assembly-default.xml @@ -1,6 +1,6 @@ <!-- #%L - xplan-root - Modul zur Gruppierung aller Webapps + xplan-webpages - Modul zur Gruppierung aller Webapps %% Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH %% diff --git a/xplan-webapps/xplan-root/src/main/assembly/assembly-root.xml b/xplan-documentation/xplan-webpages/src/main/assembly/assembly-root.xml similarity index 96% rename from xplan-webapps/xplan-root/src/main/assembly/assembly-root.xml rename to xplan-documentation/xplan-webpages/src/main/assembly/assembly-root.xml index 7a0596ee67aafe65bd1506b89cd03def0da62424..63d6d144ca8a0d79436560304f7afffaa69f9f0a 100644 --- a/xplan-webapps/xplan-root/src/main/assembly/assembly-root.xml +++ b/xplan-documentation/xplan-webpages/src/main/assembly/assembly-root.xml @@ -1,6 +1,6 @@ <!-- #%L - xplan-root - Modul zur Gruppierung aller Webapps + xplan-webpages - Modul zur Gruppierung aller Webapps %% Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH %% diff --git a/xplan-webapps/xplan-root/src/main/filter/default.properties b/xplan-documentation/xplan-webpages/src/main/filter/default.properties similarity index 100% rename from xplan-webapps/xplan-root/src/main/filter/default.properties rename to xplan-documentation/xplan-webpages/src/main/filter/default.properties diff --git a/xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_4_0.pdf b/xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_4_0.pdf similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_4_0.pdf rename to xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_4_0.pdf diff --git a/xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_4_1.pdf b/xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_4_1.pdf similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_4_1.pdf rename to xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_4_1.pdf diff --git a/xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_0.pdf b/xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_0.pdf similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_0.pdf rename to xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_0.pdf diff --git a/xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_1.pdf b/xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_1.pdf similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_1.pdf rename to xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_1.pdf diff --git a/xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_2.pdf b/xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_2.pdf similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_2.pdf rename to xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_2.pdf diff --git a/xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_3.pdf b/xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_3.pdf similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_3.pdf rename to xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_3.pdf diff --git a/xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_4.pdf b/xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_4.pdf similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_4.pdf rename to xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_5_4.pdf diff --git a/xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_6_0.pdf b/xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_6_0.pdf similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_6_0.pdf rename to xplan-documentation/xplan-webpages/src/main/resources/external/documentation/Konformitaetsbedingungen_XPlanGML_6_0.pdf diff --git a/xplan-webapps/xplan-root/src/main/resources/index.html b/xplan-documentation/xplan-webpages/src/main/resources/index.html similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/index.html rename to xplan-documentation/xplan-webpages/src/main/resources/index.html diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/latilong.png b/xplan-documentation/xplan-webpages/src/main/resources/latilong.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/latilong.png rename to xplan-documentation/xplan-webpages/src/main/resources/latilong.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/latlon_logo_schriftzug.png b/xplan-documentation/xplan-webpages/src/main/resources/latlon_logo_schriftzug.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/latlon_logo_schriftzug.png rename to xplan-documentation/xplan-webpages/src/main/resources/latlon_logo_schriftzug.png diff --git a/xplan-webapps/xplan-root/src/main/resources/logo-deegree.png b/xplan-documentation/xplan-webpages/src/main/resources/logo-deegree.png similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/logo-deegree.png rename to xplan-documentation/xplan-webpages/src/main/resources/logo-deegree.png diff --git a/xplan-webapps/xplan-root/src/main/resources/logo_xplanung.png b/xplan-documentation/xplan-webpages/src/main/resources/logo_xplanung.png similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/logo_xplanung.png rename to xplan-documentation/xplan-webpages/src/main/resources/logo_xplanung.png diff --git a/xplan-webapps/xplan-root/src/main/resources/xplanroot.css b/xplan-documentation/xplan-webpages/src/main/resources/xplanroot.css similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/xplanroot.css rename to xplan-documentation/xplan-webpages/src/main/resources/xplanroot.css diff --git a/xplan-dokumente/pom.xml b/xplan-dokumente/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..e0893d9e04e21f01de341b6335639a74580655a9 --- /dev/null +++ b/xplan-dokumente/pom.xml @@ -0,0 +1,19 @@ +<?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-dokumente</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>de.latlon.product.xplanbox</groupId> + <artifactId>xplanbox</artifactId> + <version>7.2-SNAPSHOT</version> + </parent> + + <modules> + <module>xplan-dokumente-api</module> + <module>xplan-dokumente-config</module> + </modules> + +</project> \ No newline at end of file diff --git a/xplan-api/xplan-api-dokumente/.maven-dockerinclude b/xplan-dokumente/xplan-dokumente-api/.maven-dockerinclude similarity index 100% rename from xplan-api/xplan-api-dokumente/.maven-dockerinclude rename to xplan-dokumente/xplan-dokumente-api/.maven-dockerinclude diff --git a/xplan-api/xplan-api-dokumente/Dockerfile b/xplan-dokumente/xplan-dokumente-api/Dockerfile similarity index 100% rename from xplan-api/xplan-api-dokumente/Dockerfile rename to xplan-dokumente/xplan-dokumente-api/Dockerfile diff --git a/xplan-api/xplan-api-dokumente/pom.xml b/xplan-dokumente/xplan-dokumente-api/pom.xml similarity index 87% rename from xplan-api/xplan-api-dokumente/pom.xml rename to xplan-dokumente/xplan-dokumente-api/pom.xml index d91fa95c405304ce96ffa178a476b9d63d395d88..d03cfcd8a0d46b0c6150cc6e9fba3061cacde1f0 100755 --- a/xplan-api/xplan-api-dokumente/pom.xml +++ b/xplan-dokumente/xplan-dokumente-api/pom.xml @@ -1,12 +1,12 @@ <?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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <artifactId>xplan-api-dokumente</artifactId> + <artifactId>xplan-dokumente-api</artifactId> <packaging>war</packaging> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-api</artifactId> + <artifactId>xplan-dokumente</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -53,6 +53,34 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <failOnMissingWebXml>false</failOnMissingWebXml> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + <webResources> + <resource> + <directory>src/main/webapp</directory> + <includes> + <include>**/version.txt</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/webapp</directory> + <excludes> + <exclude>**/version.txt</exclude> + </excludes> + <filtering>false</filtering> + </resource> + </webResources> + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -70,11 +98,11 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-api-commons</artifactId> + <artifactId>xplan-core-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-manager-core</artifactId> + <artifactId>xplan-core-manager</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -240,7 +268,6 @@ <id>docker</id> <properties> <docker-image.skip>false</docker-image.skip> - <docker-image.name>xplan-dokumente-api</docker-image.name> </properties> <dependencies> <dependency> <!-- faked maven dependency to be after base docker image in the reactor build --> diff --git a/xplan-api/xplan-api-dokumente/run.sh b/xplan-dokumente/xplan-dokumente-api/run.sh similarity index 100% rename from xplan-api/xplan-api-dokumente/run.sh rename to xplan-dokumente/xplan-dokumente-api/run.sh diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContext.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContext.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContext.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContext.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContextPart1.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContextPart1.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContextPart1.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/config/ApplicationContextPart1.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/DokumentenApiConfiguration.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/config/DokumentenApiConfiguration.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/DokumentenApiConfiguration.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/config/DokumentenApiConfiguration.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/JerseyConfig.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/config/JerseyConfig.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/JerseyConfig.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/config/JerseyConfig.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/S3DocumentContext.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/config/S3DocumentContext.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/config/S3DocumentContext.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/config/S3DocumentContext.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/exception/InvalidDocument.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/exception/InvalidDocument.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/exception/InvalidDocument.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/exception/InvalidDocument.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/handler/ConfigHandler.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/handler/ConfigHandler.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/handler/ConfigHandler.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/handler/ConfigHandler.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/handler/DocumentHandler.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/handler/DocumentHandler.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/handler/DocumentHandler.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/handler/DocumentHandler.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/service/DocumentHeader.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/service/DocumentHeader.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/service/DocumentHeader.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/service/DocumentHeader.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/service/DocumentHeaderWithStream.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/service/DocumentHeaderWithStream.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/service/DocumentHeaderWithStream.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/service/DocumentHeaderWithStream.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/service/DocumentService.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/service/DocumentService.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/service/DocumentService.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/service/DocumentService.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/service/db/DBDocumentService.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/service/db/DBDocumentService.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/service/db/DBDocumentService.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/service/db/DBDocumentService.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/service/s3/S3DocumentService.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/service/s3/S3DocumentService.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/service/s3/S3DocumentService.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/service/s3/S3DocumentService.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/v1/DefaultApi.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/v1/DefaultApi.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/v1/DefaultApi.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/v1/DefaultApi.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/v1/DokumentApi.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/v1/DokumentApi.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/v1/DokumentApi.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/v1/DokumentApi.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/v1/InfoApi.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/v1/InfoApi.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/v1/InfoApi.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/v1/InfoApi.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/v1/StatusApi.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/v1/StatusApi.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/v1/StatusApi.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/v1/StatusApi.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/v1/model/Document.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/v1/model/Document.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/v1/model/Document.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/v1/model/Document.java diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/v1/model/SystemConfig.java b/xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/v1/model/SystemConfig.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/v1/model/SystemConfig.java rename to xplan-dokumente/xplan-dokumente-api/src/main/java/de/latlon/xplanbox/api/dokumente/v1/model/SystemConfig.java diff --git a/xplan-api/xplan-api-dokumente/src/main/resources/application.properties b/xplan-dokumente/xplan-dokumente-api/src/main/resources/application.properties similarity index 95% rename from xplan-api/xplan-api-dokumente/src/main/resources/application.properties rename to xplan-dokumente/xplan-dokumente-api/src/main/resources/application.properties index 3427fa5a4e7774816f5fc7d705639b305bb8ac9d..a08f9e40325bbd34c0d2fa3d6f74417434861670 100644 --- a/xplan-api/xplan-api-dokumente/src/main/resources/application.properties +++ b/xplan-dokumente/xplan-dokumente-api/src/main/resources/application.properties @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -server.servlet.context-path=/xplan-api-dokumente +server.servlet.context-path=/xplan-dokumente-api logging.level.root=warn logging.level.de.latlon=debug diff --git a/xplan-api/xplan-api-dokumente/src/main/resources/log4j2.yaml b/xplan-dokumente/xplan-dokumente-api/src/main/resources/log4j2.yaml similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/resources/log4j2.yaml rename to xplan-dokumente/xplan-dokumente-api/src/main/resources/log4j2.yaml diff --git a/xplan-api/xplan-api-dokumente/src/main/webapp/xdokumente/version.txt b/xplan-dokumente/xplan-dokumente-api/src/main/webapp/xdokumente/version.txt similarity index 100% rename from xplan-api/xplan-api-dokumente/src/main/webapp/xdokumente/version.txt rename to xplan-dokumente/xplan-dokumente-api/src/main/webapp/xdokumente/version.txt diff --git a/xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/config/HsqlJpaContext.java b/xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/config/HsqlJpaContext.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/config/HsqlJpaContext.java rename to xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/config/HsqlJpaContext.java diff --git a/xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/config/TestContext.java b/xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/config/TestContext.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/config/TestContext.java rename to xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/config/TestContext.java diff --git a/xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/handler/ConfigHandlerTest.java b/xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/handler/ConfigHandlerTest.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/handler/ConfigHandlerTest.java rename to xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/handler/ConfigHandlerTest.java diff --git a/xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/handler/DocumentHandlerTest.java b/xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/handler/DocumentHandlerTest.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/handler/DocumentHandlerTest.java rename to xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/handler/DocumentHandlerTest.java diff --git a/xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/v1/DefaultApiTest.java b/xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/v1/DefaultApiTest.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/v1/DefaultApiTest.java rename to xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/v1/DefaultApiTest.java diff --git a/xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/v1/DokumentApiTest.java b/xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/v1/DokumentApiTest.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/v1/DokumentApiTest.java rename to xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/v1/DokumentApiTest.java diff --git a/xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/v1/InfoApiTest.java b/xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/v1/InfoApiTest.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/v1/InfoApiTest.java rename to xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/v1/InfoApiTest.java diff --git a/xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/v1/StatusApiTest.java b/xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/v1/StatusApiTest.java similarity index 100% rename from xplan-api/xplan-api-dokumente/src/test/java/de/latlon/xplanbox/api/dokumente/v1/StatusApiTest.java rename to xplan-dokumente/xplan-dokumente-api/src/test/java/de/latlon/xplanbox/api/dokumente/v1/StatusApiTest.java diff --git a/xplan-api/xplan-api-dokumente/src/test/resources/create-schema.sql b/xplan-dokumente/xplan-dokumente-api/src/test/resources/create-schema.sql similarity index 100% rename from xplan-api/xplan-api-dokumente/src/test/resources/create-schema.sql rename to xplan-dokumente/xplan-dokumente-api/src/test/resources/create-schema.sql diff --git a/xplan-api/xplan-api-dokumente/src/test/resources/jpa.properties b/xplan-dokumente/xplan-dokumente-api/src/test/resources/jpa.properties similarity index 100% rename from xplan-api/xplan-api-dokumente/src/test/resources/jpa.properties rename to xplan-dokumente/xplan-dokumente-api/src/test/resources/jpa.properties diff --git a/xplan-api/xplan-api-dokumente/src/test/resources/log4j2-test.yaml b/xplan-dokumente/xplan-dokumente-api/src/test/resources/log4j2-test.yaml similarity index 100% rename from xplan-api/xplan-api-dokumente/src/test/resources/log4j2-test.yaml rename to xplan-dokumente/xplan-dokumente-api/src/test/resources/log4j2-test.yaml diff --git a/xplan-dokumente/xplan-dokumente-config/pom.xml b/xplan-dokumente/xplan-dokumente-config/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..9c05c48cabdc16bdaedf8a34cb2b0595252176a8 --- /dev/null +++ b/xplan-dokumente/xplan-dokumente-config/pom.xml @@ -0,0 +1,38 @@ +<?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-dokumente-config</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>de.latlon.product.xplanbox</groupId> + <artifactId>xplan-dokumente</artifactId> + <version>7.2-SNAPSHOT</version> + </parent> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>zip</id> + <goals> + <goal>single</goal> + </goals> + <configuration> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <descriptors> + <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> diff --git a/xplan-configuration/xplan-dokumenten-config/src/main/assembly/assembly.xml b/xplan-dokumente/xplan-dokumente-config/src/main/assembly/assembly.xml similarity index 97% rename from xplan-configuration/xplan-dokumenten-config/src/main/assembly/assembly.xml rename to xplan-dokumente/xplan-dokumente-config/src/main/assembly/assembly.xml index 55abe58c4dd9aa23f1b9bb100ca9ebdee61b3e7b..c1a698063e97de1f5fdeeb1daabf970a40e61bbb 100644 --- a/xplan-configuration/xplan-dokumenten-config/src/main/assembly/assembly.xml +++ b/xplan-dokumente/xplan-dokumente-config/src/main/assembly/assembly.xml @@ -21,7 +21,7 @@ <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-dokumenten-config</id> + <id>xplan-dokumente-config</id> <formats> <format>zip</format> </formats> diff --git a/xplan-configuration/xplan-dokumenten-config/src/main/resources/dokumentenApiConfiguration.properties b/xplan-dokumente/xplan-dokumente-config/src/main/resources/dokumentenApiConfiguration.properties similarity index 100% rename from xplan-configuration/xplan-dokumenten-config/src/main/resources/dokumentenApiConfiguration.properties rename to xplan-dokumente/xplan-dokumente-config/src/main/resources/dokumentenApiConfiguration.properties diff --git a/xplan-manager/pom.xml b/xplan-manager/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..5efd1c2aff1d476ce6d3ce67d89ecd7a747c9cf6 --- /dev/null +++ b/xplan-manager/pom.xml @@ -0,0 +1,20 @@ +<?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-manager</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>de.latlon.product.xplanbox</groupId> + <artifactId>xplanbox</artifactId> + <version>7.2-SNAPSHOT</version> + </parent> + + <modules> + <module>xplan-manager-api</module> + <module>xplan-manager-config</module> + <module>xplan-manager-web</module> + </modules> + +</project> \ No newline at end of file diff --git a/xplan-api/xplan-api-manager/.maven-dockerinclude b/xplan-manager/xplan-manager-api/.maven-dockerinclude similarity index 100% rename from xplan-api/xplan-api-manager/.maven-dockerinclude rename to xplan-manager/xplan-manager-api/.maven-dockerinclude diff --git a/xplan-api/xplan-api-manager/Dockerfile b/xplan-manager/xplan-manager-api/Dockerfile similarity index 100% rename from xplan-api/xplan-api-manager/Dockerfile rename to xplan-manager/xplan-manager-api/Dockerfile diff --git a/xplan-api/xplan-api-manager/pom.xml b/xplan-manager/xplan-manager-api/pom.xml similarity index 89% rename from xplan-api/xplan-api-manager/pom.xml rename to xplan-manager/xplan-manager-api/pom.xml index d9a5b14c39b79bd91a53f76dc08f72c6221c9fd3..6fe0b672339d5f76a3367064ee6872b61c24e230 100644 --- a/xplan-api/xplan-api-manager/pom.xml +++ b/xplan-manager/xplan-manager-api/pom.xml @@ -1,12 +1,12 @@ <?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-api-manager</artifactId> + <artifactId>xplan-manager-api</artifactId> <packaging>war</packaging> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-api</artifactId> + <artifactId>xplan-manager</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -53,6 +53,34 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <failOnMissingWebXml>false</failOnMissingWebXml> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + <webResources> + <resource> + <directory>src/main/webapp</directory> + <includes> + <include>**/version.txt</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/webapp</directory> + <excludes> + <exclude>**/version.txt</exclude> + </excludes> + <filtering>false</filtering> + </resource> + </webResources> + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -71,15 +99,15 @@ <!-- xPlanBox --> <dependency> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-manager-core</artifactId> + <artifactId>xplan-core-manager</artifactId> </dependency> <dependency> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-api-commons</artifactId> + <artifactId>xplan-core-api</artifactId> </dependency> <dependency> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-security</artifactId> + <artifactId>xplan-core-security</artifactId> <version>${project.version}</version> </dependency> <!-- deegree --> @@ -314,7 +342,6 @@ <id>docker</id> <properties> <docker-image.skip>false</docker-image.skip> - <docker-image.name>xplan-manager-api</docker-image.name> </properties> <dependencies> <dependency> <!-- faked maven dependency to be after base docker image in the reactor build --> diff --git a/xplan-api/xplan-api-manager/run.sh b/xplan-manager/xplan-manager-api/run.sh similarity index 100% rename from xplan-api/xplan-api-manager/run.sh rename to xplan-manager/xplan-manager-api/run.sh diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/DatabaseVerifier.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/DatabaseVerifier.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/DatabaseVerifier.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/DatabaseVerifier.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/PlanInfoBuilder.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/PlanInfoBuilder.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/PlanInfoBuilder.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/PlanInfoBuilder.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/XPlanBoxContentTypes.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/XPlanBoxContentTypes.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/XPlanBoxContentTypes.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/XPlanBoxContentTypes.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContext.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContext.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContext.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContext.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContextPart1.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContextPart1.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContextPart1.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/config/ApplicationContextPart1.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/DefaultValidationConfiguration.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/config/DefaultValidationConfiguration.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/DefaultValidationConfiguration.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/config/DefaultValidationConfiguration.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/JerseyConfig.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/config/JerseyConfig.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/JerseyConfig.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/config/JerseyConfig.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ManagerApiConfiguration.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/config/ManagerApiConfiguration.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/config/ManagerApiConfiguration.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/config/ManagerApiConfiguration.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/AmbiguousBereichNummernExceptionMapper.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/AmbiguousBereichNummernExceptionMapper.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/AmbiguousBereichNummernExceptionMapper.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/AmbiguousBereichNummernExceptionMapper.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/DuplicateDokument.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/DuplicateDokument.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/DuplicateDokument.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/DuplicateDokument.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/DuplicateRasterbasis.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/DuplicateRasterbasis.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/DuplicateRasterbasis.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/DuplicateRasterbasis.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidApiVersion.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidApiVersion.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidApiVersion.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidApiVersion.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidDokumentId.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidDokumentId.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidDokumentId.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidDokumentId.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidPlan.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidPlan.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidPlan.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidPlan.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidPlanName.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidPlanName.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidPlanName.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidPlanName.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidPlanToEdit.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidPlanToEdit.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidPlanToEdit.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidPlanToEdit.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidRasterbasisId.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidRasterbasisId.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidRasterbasisId.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidRasterbasisId.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidSearch.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidSearch.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidSearch.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidSearch.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidTextId.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidTextId.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidTextId.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/InvalidTextId.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/MissingBereichNummer.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/MissingBereichNummer.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/MissingBereichNummer.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/MissingBereichNummer.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/MissingRequestEntity.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/MissingRequestEntity.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/MissingRequestEntity.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/MissingRequestEntity.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/PlanNotFoundExceptionMapper.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/PlanNotFoundExceptionMapper.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/PlanNotFoundExceptionMapper.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/PlanNotFoundExceptionMapper.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/UnexpectedError.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/UnexpectedError.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/UnexpectedError.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/UnexpectedError.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/UnsupportedPlanExceptionMapper.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/UnsupportedPlanExceptionMapper.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/exception/UnsupportedPlanExceptionMapper.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/exception/UnsupportedPlanExceptionMapper.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/ConfigHandler.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/ConfigHandler.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/ConfigHandler.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/ConfigHandler.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditAenderungenHandler.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditAenderungenHandler.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditAenderungenHandler.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditAenderungenHandler.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditBasisdatenHandler.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditBasisdatenHandler.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditBasisdatenHandler.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditBasisdatenHandler.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditDokumentHandler.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditDokumentHandler.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditDokumentHandler.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditDokumentHandler.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditGueltigkeitHandler.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditGueltigkeitHandler.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditGueltigkeitHandler.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditGueltigkeitHandler.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditHandler.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditHandler.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditHandler.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditHandler.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditRasterbasisHandler.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditRasterbasisHandler.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditRasterbasisHandler.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditRasterbasisHandler.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditTextHandler.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditTextHandler.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/EditTextHandler.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/EditTextHandler.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/PlanHandler.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/PlanHandler.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/handler/PlanHandler.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/handler/PlanHandler.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/openapi/ManagerOpenApiFilter.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/openapi/ManagerOpenApiFilter.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/openapi/ManagerOpenApiFilter.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/openapi/ManagerOpenApiFilter.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/DefaultApi.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/DefaultApi.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/DefaultApi.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/DefaultApi.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/InfoApi.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/InfoApi.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/InfoApi.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/InfoApi.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanAenderungenApi.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanAenderungenApi.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanAenderungenApi.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanAenderungenApi.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanApi.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanApi.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanApi.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanApi.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanBasisdatenApi.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanBasisdatenApi.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanBasisdatenApi.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanBasisdatenApi.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanDokumentApi.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanDokumentApi.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanDokumentApi.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanDokumentApi.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanGueltigkeitApi.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanGueltigkeitApi.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanGueltigkeitApi.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanGueltigkeitApi.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanRasterbasisApi.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanRasterbasisApi.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanRasterbasisApi.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanRasterbasisApi.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanTextApi.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanTextApi.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanTextApi.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlanTextApi.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlansApi.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlansApi.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/PlansApi.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/PlansApi.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/Status.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/Status.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/Status.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/Status.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Aenderung.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Aenderung.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Aenderung.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Aenderung.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Aenderungen.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Aenderungen.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Aenderungen.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Aenderungen.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Basisdaten.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Basisdaten.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Basisdaten.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Basisdaten.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Bereich.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Bereich.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Bereich.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Bereich.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Dokument.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Dokument.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Dokument.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Dokument.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Link.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Link.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Link.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Link.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/ManagerSystemConfig.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/ManagerSystemConfig.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/ManagerSystemConfig.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/ManagerSystemConfig.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/PlanInfo.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/PlanInfo.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/PlanInfo.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/PlanInfo.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/PlanInfoXplanModelData.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/PlanInfoXplanModelData.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/PlanInfoXplanModelData.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/PlanInfoXplanModelData.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/PlanStatusEnum.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/PlanStatusEnum.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/PlanStatusEnum.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/PlanStatusEnum.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Rasterbasis.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Rasterbasis.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Rasterbasis.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Rasterbasis.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Referenz.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Referenz.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Referenz.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Referenz.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/StatusMessage.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/StatusMessage.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/StatusMessage.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/StatusMessage.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Text.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Text.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Text.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Text.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Zeitraum.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Zeitraum.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Zeitraum.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/v1/model/Zeitraum.java diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/validation/ModelValidator.java b/xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/validation/ModelValidator.java similarity index 100% rename from xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/validation/ModelValidator.java rename to xplan-manager/xplan-manager-api/src/main/java/de/latlon/xplanbox/api/manager/validation/ModelValidator.java diff --git a/xplan-api/xplan-api-manager/src/main/resources/application.properties b/xplan-manager/xplan-manager-api/src/main/resources/application.properties similarity index 95% rename from xplan-api/xplan-api-manager/src/main/resources/application.properties rename to xplan-manager/xplan-manager-api/src/main/resources/application.properties index 66e5b3fc2c7cf67938c1d22d5dc05ec7fa92bce9..cce5048aafc420746cf5ff1d4716cc695448dfbe 100644 --- a/xplan-api/xplan-api-manager/src/main/resources/application.properties +++ b/xplan-manager/xplan-manager-api/src/main/resources/application.properties @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -server.servlet.context-path=/xplan-api-manager +server.servlet.context-path=/xplan-manager-api spring.main.allow-bean-definition-overriding=true diff --git a/xplan-api/xplan-api-manager/src/main/resources/log4j2.yaml b/xplan-manager/xplan-manager-api/src/main/resources/log4j2.yaml similarity index 100% rename from xplan-api/xplan-api-manager/src/main/resources/log4j2.yaml rename to xplan-manager/xplan-manager-api/src/main/resources/log4j2.yaml diff --git a/xplan-api/xplan-api-manager/src/main/resources/xplanmanager_v10.yaml b/xplan-manager/xplan-manager-api/src/main/resources/xplanmanager_v10.yaml similarity index 100% rename from xplan-api/xplan-api-manager/src/main/resources/xplanmanager_v10.yaml rename to xplan-manager/xplan-manager-api/src/main/resources/xplanmanager_v10.yaml diff --git a/xplan-api/xplan-api-manager/src/main/resources/xplanmanager_v11.yaml b/xplan-manager/xplan-manager-api/src/main/resources/xplanmanager_v11.yaml similarity index 100% rename from xplan-api/xplan-api-manager/src/main/resources/xplanmanager_v11.yaml rename to xplan-manager/xplan-manager-api/src/main/resources/xplanmanager_v11.yaml diff --git a/xplan-api/xplan-api-manager/src/main/webapp/xmanager/version.txt b/xplan-manager/xplan-manager-api/src/main/webapp/xmanager/version.txt similarity index 100% rename from xplan-api/xplan-api-manager/src/main/webapp/xmanager/version.txt rename to xplan-manager/xplan-manager-api/src/main/webapp/xmanager/version.txt diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/config/HsqlJpaContext.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/config/HsqlJpaContext.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/config/HsqlJpaContext.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/config/HsqlJpaContext.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/config/TestContext.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/config/TestContext.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/config/TestContext.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/config/TestContext.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/handler/EditBasisdatenHandlerTest.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/handler/EditBasisdatenHandlerTest.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/handler/EditBasisdatenHandlerTest.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/handler/EditBasisdatenHandlerTest.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/handler/PlanHandlerTest.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/handler/PlanHandlerTest.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/handler/PlanHandlerTest.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/handler/PlanHandlerTest.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/DefaultApiTest.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/DefaultApiTest.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/DefaultApiTest.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/DefaultApiTest.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/InfoApiTest.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/InfoApiTest.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/InfoApiTest.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/InfoApiTest.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanAenderungApiTest.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanAenderungApiTest.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanAenderungApiTest.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanAenderungApiTest.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanApiTest.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanApiTest.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanApiTest.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanApiTest.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanBasisdatenApiTest.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanBasisdatenApiTest.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanBasisdatenApiTest.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanBasisdatenApiTest.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanDokumentApiTest.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanDokumentApiTest.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanDokumentApiTest.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanDokumentApiTest.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanGueltigkeitApiTest.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanGueltigkeitApiTest.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanGueltigkeitApiTest.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanGueltigkeitApiTest.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanRasterbasisApiTest.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanRasterbasisApiTest.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanRasterbasisApiTest.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanRasterbasisApiTest.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanTextApiTest.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanTextApiTest.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanTextApiTest.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlanTextApiTest.java diff --git a/xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlansApiTest.java b/xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlansApiTest.java similarity index 100% rename from xplan-api/xplan-api-manager/src/test/java/de/latlon/xplanbox/api/manager/v1/PlansApiTest.java rename to xplan-manager/xplan-manager-api/src/test/java/de/latlon/xplanbox/api/manager/v1/PlansApiTest.java diff --git a/xplan-api/xplan-api-manager/src/test/resources/bplan_valid_41.zip b/xplan-manager/xplan-manager-api/src/test/resources/bplan_valid_41.zip similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/bplan_valid_41.zip rename to xplan-manager/xplan-manager-api/src/test/resources/bplan_valid_41.zip diff --git a/xplan-api/xplan-api-manager/src/test/resources/bplanraster.xml b/xplan-manager/xplan-manager-api/src/test/resources/bplanraster.xml similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/bplanraster.xml rename to xplan-manager/xplan-manager-api/src/test/resources/bplanraster.xml diff --git a/xplan-api/xplan-api-manager/src/test/resources/create-schema.sql b/xplan-manager/xplan-manager-api/src/test/resources/create-schema.sql similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/create-schema.sql rename to xplan-manager/xplan-manager-api/src/test/resources/create-schema.sql diff --git a/xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/aenderungen.json b/xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/aenderungen.json similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/aenderungen.json rename to xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/aenderungen.json diff --git a/xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/basisdatenmodel.json b/xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/basisdatenmodel.json similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/basisdatenmodel.json rename to xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/basisdatenmodel.json diff --git a/xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/basisdatenmodel_invalidBeschreibungAndName.json b/xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/basisdatenmodel_invalidBeschreibungAndName.json similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/basisdatenmodel_invalidBeschreibungAndName.json rename to xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/basisdatenmodel_invalidBeschreibungAndName.json diff --git a/xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/datei.pdf b/xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/datei.pdf similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/datei.pdf rename to xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/datei.pdf diff --git a/xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/dokumentmodel.json b/xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/dokumentmodel.json similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/dokumentmodel.json rename to xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/dokumentmodel.json diff --git a/xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/georeferenz.txt b/xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/georeferenz.txt similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/georeferenz.txt rename to xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/georeferenz.txt diff --git a/xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/gueltigkeit.json b/xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/gueltigkeit.json similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/gueltigkeit.json rename to xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/gueltigkeit.json diff --git a/xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/rasterbasismodel.json b/xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/rasterbasismodel.json similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/rasterbasismodel.json rename to xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/rasterbasismodel.json diff --git a/xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/rasterbasismodel_missingbereichnummer.json b/xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/rasterbasismodel_missingbereichnummer.json similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/rasterbasismodel_missingbereichnummer.json rename to xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/rasterbasismodel_missingbereichnummer.json diff --git a/xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/textmodel.json b/xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/textmodel.json similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/de/latlon/xplanbox/api/manager/v1/textmodel.json rename to xplan-manager/xplan-manager-api/src/test/resources/de/latlon/xplanbox/api/manager/v1/textmodel.json diff --git a/xplan-api/xplan-api-manager/src/test/resources/fplanraster.xml b/xplan-manager/xplan-manager-api/src/test/resources/fplanraster.xml similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/fplanraster.xml rename to xplan-manager/xplan-manager-api/src/test/resources/fplanraster.xml diff --git a/xplan-api/xplan-api-manager/src/test/resources/log4j2-test.yaml b/xplan-manager/xplan-manager-api/src/test/resources/log4j2-test.yaml similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/log4j2-test.yaml rename to xplan-manager/xplan-manager-api/src/test/resources/log4j2-test.yaml diff --git a/xplan-api/xplan-api-manager/src/test/resources/lplanraster.xml b/xplan-manager/xplan-manager-api/src/test/resources/lplanraster.xml similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/lplanraster.xml rename to xplan-manager/xplan-manager-api/src/test/resources/lplanraster.xml diff --git a/xplan-api/xplan-api-manager/src/test/resources/rplanraster.xml b/xplan-manager/xplan-manager-api/src/test/resources/rplanraster.xml similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/rplanraster.xml rename to xplan-manager/xplan-manager-api/src/test/resources/rplanraster.xml diff --git a/xplan-api/xplan-api-manager/src/test/resources/soplanraster.xml b/xplan-manager/xplan-manager-api/src/test/resources/soplanraster.xml similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/soplanraster.xml rename to xplan-manager/xplan-manager-api/src/test/resources/soplanraster.xml diff --git a/xplan-api/xplan-api-manager/src/test/resources/xplan.gml b/xplan-manager/xplan-manager-api/src/test/resources/xplan.gml similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/xplan.gml rename to xplan-manager/xplan-manager-api/src/test/resources/xplan.gml diff --git a/xplan-api/xplan-api-manager/src/test/resources/xplan51-edited.gml b/xplan-manager/xplan-manager-api/src/test/resources/xplan51-edited.gml similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/xplan51-edited.gml rename to xplan-manager/xplan-manager-api/src/test/resources/xplan51-edited.gml diff --git a/xplan-api/xplan-api-manager/src/test/resources/xplan51.gml b/xplan-manager/xplan-manager-api/src/test/resources/xplan51.gml similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/xplan51.gml rename to xplan-manager/xplan-manager-api/src/test/resources/xplan51.gml diff --git a/xplan-api/xplan-api-manager/src/test/resources/xplan51_ohneBereich.gml b/xplan-manager/xplan-manager-api/src/test/resources/xplan51_ohneBereich.gml similarity index 100% rename from xplan-api/xplan-api-manager/src/test/resources/xplan51_ohneBereich.gml rename to xplan-manager/xplan-manager-api/src/test/resources/xplan51_ohneBereich.gml diff --git a/xplan-configuration/xplan-manager-config/pom.xml b/xplan-manager/xplan-manager-config/pom.xml similarity index 71% rename from xplan-configuration/xplan-manager-config/pom.xml rename to xplan-manager/xplan-manager-config/pom.xml index 68e17ffd404e6f15df92aa0d46c72c95ff4d428f..212fd41673a695684d9ddeb0b3ad685a62b28751 100644 --- a/xplan-configuration/xplan-manager-config/pom.xml +++ b/xplan-manager/xplan-manager-config/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-configuration</artifactId> + <artifactId>xplan-manager</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -16,6 +16,20 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> + <execution> + <id>zip</id> + <goals> + <goal>single</goal> + </goals> + <configuration> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <descriptors> + <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + <phase>package</phase> + </execution> <execution> <id>default</id> <goals> @@ -41,7 +55,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-schemas</artifactId> + <artifactId>xplan-core-schemas</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> diff --git a/xplan-configuration/xplan-manager-config/src/main/assembly/assembly-default.xml b/xplan-manager/xplan-manager-config/src/main/assembly/assembly-default.xml similarity index 95% rename from xplan-configuration/xplan-manager-config/src/main/assembly/assembly-default.xml rename to xplan-manager/xplan-manager-config/src/main/assembly/assembly-default.xml index 9a2291fbd073819797166de6b2a047c567afcdea..d17b06b82b0f8a3e43dda842ab63b0c9cf9c2697 100644 --- a/xplan-configuration/xplan-manager-config/src/main/assembly/assembly-default.xml +++ b/xplan-manager/xplan-manager-config/src/main/assembly/assembly-default.xml @@ -36,7 +36,7 @@ <dependencySets> <dependencySet> <includes> - <include>de.latlon.product.xplanbox:xplan-schemas:zip:*</include> + <include>de.latlon.product.xplanbox:xplan-core-schemas:zip:*</include> </includes> <useProjectArtifact>false</useProjectArtifact> <unpack>true</unpack> diff --git a/xplan-configuration/xplan-manager-config/src/main/assembly/assembly.xml b/xplan-manager/xplan-manager-config/src/main/assembly/assembly.xml similarity index 95% rename from xplan-configuration/xplan-manager-config/src/main/assembly/assembly.xml rename to xplan-manager/xplan-manager-config/src/main/assembly/assembly.xml index 219cbce12690eff610b3e2ea4713441f0d4ad399..6363fd9e3af25976e4303aa1b84ae60856acb198 100644 --- a/xplan-configuration/xplan-manager-config/src/main/assembly/assembly.xml +++ b/xplan-manager/xplan-manager-config/src/main/assembly/assembly.xml @@ -35,7 +35,7 @@ <dependencySets> <dependencySet> <includes> - <include>de.latlon.product.xplanbox:xplan-schemas:zip:*</include> + <include>de.latlon.product.xplanbox:xplan-core-schemas:zip:*</include> </includes> <useProjectArtifact>false</useProjectArtifact> <unpack>true</unpack> diff --git a/xplan-configuration/xplan-manager-config/src/main/filter/filter-default.properties b/xplan-manager/xplan-manager-config/src/main/filter/filter-default.properties similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/filter/filter-default.properties rename to xplan-manager/xplan-manager-config/src/main/filter/filter-default.properties diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/appschemas/inspireplu/PlannedLandUse-AdaptedGml.xsd b/xplan-manager/xplan-manager-config/src/main/resources/appschemas/inspireplu/PlannedLandUse-AdaptedGml.xsd similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/appschemas/inspireplu/PlannedLandUse-AdaptedGml.xsd rename to xplan-manager/xplan-manager-config/src/main/resources/appschemas/inspireplu/PlannedLandUse-AdaptedGml.xsd diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/appschemas/inspireplu/gmlProfilexplan.xsd b/xplan-manager/xplan-manager-config/src/main/resources/appschemas/inspireplu/gmlProfilexplan.xsd similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/appschemas/inspireplu/gmlProfilexplan.xsd rename to xplan-manager/xplan-manager-config/src/main/resources/appschemas/inspireplu/gmlProfilexplan.xsd diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/codelists/rechtsstand-processStepGeneral.csv b/xplan-manager/xplan-manager-config/src/main/resources/codelists/rechtsstand-processStepGeneral.csv similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/codelists/rechtsstand-processStepGeneral.csv rename to xplan-manager/xplan-manager-config/src/main/resources/codelists/rechtsstand-processStepGeneral.csv diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/codelists/xplan41/rechtscharacter-regulationNature.csv b/xplan-manager/xplan-manager-config/src/main/resources/codelists/xplan41/rechtscharacter-regulationNature.csv similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/codelists/xplan41/rechtscharacter-regulationNature.csv rename to xplan-manager/xplan-manager-config/src/main/resources/codelists/xplan41/rechtscharacter-regulationNature.csv diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/codelists/xplan50/rechtscharacter-regulationNature.csv b/xplan-manager/xplan-manager-config/src/main/resources/codelists/xplan50/rechtscharacter-regulationNature.csv similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/codelists/xplan50/rechtscharacter-regulationNature.csv rename to xplan-manager/xplan-manager-config/src/main/resources/codelists/xplan50/rechtscharacter-regulationNature.csv diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/codelists/xplan51/versionBauNVODatum.csv b/xplan-manager/xplan-manager-config/src/main/resources/codelists/xplan51/versionBauNVODatum.csv similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/codelists/xplan51/versionBauNVODatum.csv rename to xplan-manager/xplan-manager-config/src/main/resources/codelists/xplan51/versionBauNVODatum.csv diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41/xplanGml41-inspirePlu.halex b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41/xplanGml41-inspirePlu.halex similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41/xplanGml41-inspirePlu.halex rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41/xplanGml41-inspirePlu.halex diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41/xplanGml41-inspirePlu.halex.alignment.xml b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41/xplanGml41-inspirePlu.halex.alignment.xml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41/xplanGml41-inspirePlu.halex.alignment.xml rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41/xplanGml41-inspirePlu.halex.alignment.xml diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41/xplanGml41-inspirePlu.halex.styles.sld b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41/xplanGml41-inspirePlu.halex.styles.sld similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41/xplanGml41-inspirePlu.halex.styles.sld rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41/xplanGml41-inspirePlu.halex.styles.sld diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41nach51/trim.groovy b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41nach51/trim.groovy similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41nach51/trim.groovy rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41nach51/trim.groovy diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41nach51/xplanGml41-xplanGml51.halex b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41nach51/xplanGml41-xplanGml51.halex similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41nach51/xplanGml41-xplanGml51.halex rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41nach51/xplanGml41-xplanGml51.halex diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41nach51/xplanGml41-xplanGml51.halex.alignment.xml b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41nach51/xplanGml41-xplanGml51.halex.alignment.xml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41nach51/xplanGml41-xplanGml51.halex.alignment.xml rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41nach51/xplanGml41-xplanGml51.halex.alignment.xml diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41nach51/xplanGml41-xplanGml51.halex.styles.sld b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41nach51/xplanGml41-xplanGml51.halex.styles.sld similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan41nach51/xplanGml41-xplanGml51.halex.styles.sld rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan41nach51/xplanGml41-xplanGml51.halex.styles.sld diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan50/classification.groovy b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan50/classification.groovy similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan50/classification.groovy rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan50/classification.groovy diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan50/xplanGml50-inspirePlu.halex b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan50/xplanGml50-inspirePlu.halex similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan50/xplanGml50-inspirePlu.halex rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan50/xplanGml50-inspirePlu.halex diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan50/xplanGml50-inspirePlu.halex.alignment.xml b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan50/xplanGml50-inspirePlu.halex.alignment.xml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan50/xplanGml50-inspirePlu.halex.alignment.xml rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan50/xplanGml50-inspirePlu.halex.alignment.xml diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan50/xplanGml50-inspirePlu.halex.styles.sld b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan50/xplanGml50-inspirePlu.halex.styles.sld similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan50/xplanGml50-inspirePlu.halex.styles.sld rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan50/xplanGml50-inspirePlu.halex.styles.sld diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan51/xplanGml51-inspirePlu.halex b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan51/xplanGml51-inspirePlu.halex similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan51/xplanGml51-inspirePlu.halex rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan51/xplanGml51-inspirePlu.halex diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan51/xplanGml51-inspirePlu.halex.alignment.xml b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan51/xplanGml51-inspirePlu.halex.alignment.xml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan51/xplanGml51-inspirePlu.halex.alignment.xml rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan51/xplanGml51-inspirePlu.halex.alignment.xml diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan51/xplanGml51-inspirePlu.halex.styles.sld b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan51/xplanGml51-inspirePlu.halex.styles.sld similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan51/xplanGml51-inspirePlu.halex.styles.sld rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan51/xplanGml51-inspirePlu.halex.styles.sld diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan52/xplanGml52-inspirePlu.halex b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan52/xplanGml52-inspirePlu.halex similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan52/xplanGml52-inspirePlu.halex rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan52/xplanGml52-inspirePlu.halex diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan52/xplanGml52-inspirePlu.halex.alignment.xml b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan52/xplanGml52-inspirePlu.halex.alignment.xml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan52/xplanGml52-inspirePlu.halex.alignment.xml rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan52/xplanGml52-inspirePlu.halex.alignment.xml diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan52/xplanGml52-inspirePlu.halex.styles.sld b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan52/xplanGml52-inspirePlu.halex.styles.sld similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan52/xplanGml52-inspirePlu.halex.styles.sld rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan52/xplanGml52-inspirePlu.halex.styles.sld diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan53/xplanGml53-inspirePlu.halex b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan53/xplanGml53-inspirePlu.halex similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan53/xplanGml53-inspirePlu.halex rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan53/xplanGml53-inspirePlu.halex diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan53/xplanGml53-inspirePlu.halex.alignment.xml b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan53/xplanGml53-inspirePlu.halex.alignment.xml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan53/xplanGml53-inspirePlu.halex.alignment.xml rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan53/xplanGml53-inspirePlu.halex.alignment.xml diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan53/xplanGml53-inspirePlu.halex.styles.sld b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan53/xplanGml53-inspirePlu.halex.styles.sld similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan53/xplanGml53-inspirePlu.halex.styles.sld rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan53/xplanGml53-inspirePlu.halex.styles.sld diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan54/xplanGml54-inspirePlu.halex b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan54/xplanGml54-inspirePlu.halex similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan54/xplanGml54-inspirePlu.halex rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan54/xplanGml54-inspirePlu.halex diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan54/xplanGml54-inspirePlu.halex.alignment.xml b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan54/xplanGml54-inspirePlu.halex.alignment.xml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan54/xplanGml54-inspirePlu.halex.alignment.xml rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan54/xplanGml54-inspirePlu.halex.alignment.xml diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan54/xplanGml54-inspirePlu.halex.styles.sld b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan54/xplanGml54-inspirePlu.halex.styles.sld similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan54/xplanGml54-inspirePlu.halex.styles.sld rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan54/xplanGml54-inspirePlu.halex.styles.sld diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan60/xplanGml60-inspirePlu.halex b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan60/xplanGml60-inspirePlu.halex similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan60/xplanGml60-inspirePlu.halex rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan60/xplanGml60-inspirePlu.halex diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan60/xplanGml60-inspirePlu.halex.alignment.xml b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan60/xplanGml60-inspirePlu.halex.alignment.xml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan60/xplanGml60-inspirePlu.halex.alignment.xml rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan60/xplanGml60-inspirePlu.halex.alignment.xml diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan60/xplanGml60-inspirePlu.halex.styles.sld b/xplan-manager/xplan-manager-config/src/main/resources/hale/xplan60/xplanGml60-inspirePlu.halex.styles.sld similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/hale/xplan60/xplanGml60-inspirePlu.halex.styles.sld rename to xplan-manager/xplan-manager-config/src/main/resources/hale/xplan60/xplanGml60-inspirePlu.halex.styles.sld diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/managerApiConfiguration.properties b/xplan-manager/xplan-manager-config/src/main/resources/managerApiConfiguration.properties similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/managerApiConfiguration.properties rename to xplan-manager/xplan-manager-config/src/main/resources/managerApiConfiguration.properties diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/managerConfiguration.properties b/xplan-manager/xplan-manager-config/src/main/resources/managerConfiguration.properties similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/managerConfiguration.properties rename to xplan-manager/xplan-manager-config/src/main/resources/managerConfiguration.properties diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/managerWebConfiguration.properties b/xplan-manager/xplan-manager-config/src/main/resources/managerWebConfiguration.properties similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/managerWebConfiguration.properties rename to xplan-manager/xplan-manager-config/src/main/resources/managerWebConfiguration.properties diff --git a/xplan-configuration/xplan-manager-config/src/main/resources/metadata/service-iso-metadata-template.xml b/xplan-manager/xplan-manager-config/src/main/resources/metadata/service-iso-metadata-template.xml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/main/resources/metadata/service-iso-metadata-template.xml rename to xplan-manager/xplan-manager-config/src/main/resources/metadata/service-iso-metadata-template.xml diff --git a/xplan-configuration/xplan-manager-config/src/test/resources/testdata/BP2070/xplan.gml b/xplan-manager/xplan-manager-config/src/test/resources/testdata/BP2070/xplan.gml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/test/resources/testdata/BP2070/xplan.gml rename to xplan-manager/xplan-manager-config/src/test/resources/testdata/BP2070/xplan.gml diff --git a/xplan-configuration/xplan-manager-config/src/test/resources/testdata/Billstedt28/xplan.gml b/xplan-manager/xplan-manager-config/src/test/resources/testdata/Billstedt28/xplan.gml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/test/resources/testdata/Billstedt28/xplan.gml rename to xplan-manager/xplan-manager-config/src/test/resources/testdata/Billstedt28/xplan.gml diff --git a/xplan-configuration/xplan-manager-config/src/test/resources/testdata/Eidelstedt 4/xplan.gml b/xplan-manager/xplan-manager-config/src/test/resources/testdata/Eidelstedt 4/xplan.gml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/test/resources/testdata/Eidelstedt 4/xplan.gml rename to xplan-manager/xplan-manager-config/src/test/resources/testdata/Eidelstedt 4/xplan.gml diff --git a/xplan-configuration/xplan-manager-config/src/test/resources/testdata/V4_1_ID_103-25832/xplan.gml b/xplan-manager/xplan-manager-config/src/test/resources/testdata/V4_1_ID_103-25832/xplan.gml similarity index 100% rename from xplan-configuration/xplan-manager-config/src/test/resources/testdata/V4_1_ID_103-25832/xplan.gml rename to xplan-manager/xplan-manager-config/src/test/resources/testdata/V4_1_ID_103-25832/xplan.gml diff --git a/xplan-webapps/xplan-manager-web/Dockerfile b/xplan-manager/xplan-manager-web/Dockerfile similarity index 100% rename from xplan-webapps/xplan-manager-web/Dockerfile rename to xplan-manager/xplan-manager-web/Dockerfile diff --git a/xplan-webapps/xplan-manager-web/DockerfileHale b/xplan-manager/xplan-manager-web/DockerfileHale similarity index 100% rename from xplan-webapps/xplan-manager-web/DockerfileHale rename to xplan-manager/xplan-manager-web/DockerfileHale diff --git a/xplan-webapps/xplan-manager-web/pom.xml b/xplan-manager/xplan-manager-web/pom.xml similarity index 95% rename from xplan-webapps/xplan-manager-web/pom.xml rename to xplan-manager/xplan-manager-web/pom.xml index cf99155aa386607dd4616f680edc3b7409cea253..b08b392f64e9773439e1f7745ff1427f9085e0ff 100644 --- a/xplan-webapps/xplan-manager-web/pom.xml +++ b/xplan-manager/xplan-manager-web/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-webapps</artifactId> + <artifactId>xplan-manager</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -169,24 +169,25 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> <classifier>sources</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons-web</artifactId> + <artifactId>xplan-core-gwt</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-validator-web-commons</artifactId> + <artifactId>xplan-core-gwt</artifactId> + <classifier>sources</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-manager-core</artifactId> + <artifactId>xplan-core-manager</artifactId> <exclusions> <exclusion> <groupId>org.eclipse.jdt.core.compiler</groupId> @@ -273,9 +274,9 @@ <version>${project.version}</version> <type>pom</type> </dependency> - <dependency> <!-- faked maven dependency to be after xplan-sql-scripts image in the reactor build --> + <dependency> <!-- faked maven dependency to be after xplan-database-docker image in the reactor build --> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-sql-scripts</artifactId> + <artifactId>xplan-database-docker</artifactId> <version>${project.version}</version> <type>pom</type> </dependency> diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/comparator/AlphanumericComparator.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/comparator/AlphanumericComparator.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/comparator/AlphanumericComparator.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/comparator/AlphanumericComparator.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/comparator/ColumnComparator.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/comparator/ColumnComparator.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/comparator/ColumnComparator.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/comparator/ColumnComparator.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/CategoryFilter.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/CategoryFilter.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/CategoryFilter.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/CategoryFilter.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/FreeTextFilter.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/FreeTextFilter.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/FreeTextFilter.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/FreeTextFilter.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/PlanFilter.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/PlanFilter.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/PlanFilter.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/PlanFilter.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/PlanStatusFilter.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/PlanStatusFilter.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/PlanStatusFilter.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/filter/PlanStatusFilter.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ImportAndListView.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ImportAndListView.java similarity index 97% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ImportAndListView.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ImportAndListView.java index f5681791227199316381f654b917bb629ffccab2..6d2d57dec77773a66afd44c3cab007d0bd9609cc 100644 --- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ImportAndListView.java +++ b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ImportAndListView.java @@ -24,7 +24,7 @@ import com.google.gwt.event.shared.HandlerManager; import com.google.gwt.user.client.ui.VerticalPanel; import de.latlon.xplan.manager.web.shared.AuthorizationInfo; import de.latlon.xplan.manager.web.shared.ManagerWebConfiguration; -import de.latlon.xplan.validator.web.shared.ValidationConfig; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationConfig; /** * Summarizes the PlanListPanel and UploadPanel in one view. diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ImportWizardCreator.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ImportWizardCreator.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ImportWizardCreator.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ImportWizardCreator.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ManagerWebEntryPoint.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ManagerWebEntryPoint.java similarity index 94% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ManagerWebEntryPoint.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ManagerWebEntryPoint.java index 1a15db9c1cdafa782741217265fb14b3ebb7ecc0..5a58f610c74014aa4af881d27f820ed4844c68f9 100644 --- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ManagerWebEntryPoint.java +++ b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ManagerWebEntryPoint.java @@ -32,9 +32,9 @@ import de.latlon.xplan.manager.web.client.service.ManagerWebConfigurationService import de.latlon.xplan.manager.web.client.service.SecurityService; import de.latlon.xplan.manager.web.shared.AuthorizationInfo; import de.latlon.xplan.manager.web.shared.ManagerWebConfiguration; -import de.latlon.xplan.validator.web.client.service.ValidationConfigService; -import de.latlon.xplan.validator.web.client.service.ValidationConfigServiceAsync; -import de.latlon.xplan.validator.web.shared.ValidationConfig; +import de.latlon.xplanbox.core.gwt.commons.client.service.ValidationConfigService; +import de.latlon.xplanbox.core.gwt.commons.client.service.ValidationConfigServiceAsync; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationConfig; import org.fusesource.restygwt.client.Defaults; import org.fusesource.restygwt.client.Method; import org.fusesource.restygwt.client.MethodCallback; diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/PlanListColumnType.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/PlanListColumnType.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/PlanListColumnType.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/PlanListColumnType.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/PlanListPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/PlanListPanel.java similarity index 99% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/PlanListPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/PlanListPanel.java index 7dd7bc813330aeeb66f0e7299f46d20143bc7ae9..8c46e51db35e2f321b24df74fb24293d52b1dc62 100644 --- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/PlanListPanel.java +++ b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/PlanListPanel.java @@ -42,7 +42,7 @@ import com.google.gwt.user.client.ui.FlexTable; import com.google.gwt.view.client.CellPreviewEvent; import com.google.gwt.view.client.CellPreviewEvent.Handler; import com.google.gwt.view.client.ListDataProvider; -import de.latlon.xplan.commons.web.DisengageableButtonCell; +import de.latlon.xplanbox.core.gwt.commons.web.DisengageableButtonCell; import de.latlon.xplan.manager.web.client.comparator.ColumnComparator; import de.latlon.xplan.manager.web.client.filter.PlanFilter; import de.latlon.xplan.manager.web.client.gui.dialog.MapPreviewDialog; diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/StyleNames.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/StyleNames.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/StyleNames.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/StyleNames.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/UploadPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/UploadPanel.java similarity index 97% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/UploadPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/UploadPanel.java index e251165825bd3cfec2874fbef77f6e503adbea0c..0222a9d62f4727543a2c45fdf3a4da33a1597d1d 100644 --- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/UploadPanel.java +++ b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/UploadPanel.java @@ -48,13 +48,13 @@ import com.google.gwt.user.client.ui.Widget; import com.google.gwt.view.client.CellPreviewEvent; import com.google.gwt.view.client.CellPreviewEvent.Handler; import com.google.gwt.view.client.ListDataProvider; -import de.latlon.xplan.commons.web.DisengageableButtonCell; +import de.latlon.xplanbox.core.gwt.commons.web.DisengageableButtonCell; import de.latlon.xplan.manager.web.client.i18n.XPlanWebMessages; import de.latlon.xplan.manager.web.shared.ManagerWebConfiguration; import de.latlon.xplan.manager.web.shared.XPlan; -import de.latlon.xplan.validator.web.client.ValidatorOptionsDialog; -import de.latlon.xplan.validator.web.client.report.ReportDownloadFinishedListener; -import de.latlon.xplan.validator.web.shared.ValidationConfig; +import de.latlon.xplanbox.core.gwt.commons.client.ValidatorOptionsDialog; +import de.latlon.xplanbox.core.gwt.commons.client.report.ReportDownloadFinishedListener; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationConfig; import org.fusesource.restygwt.client.Method; import org.fusesource.restygwt.client.MethodCallback; @@ -62,7 +62,7 @@ import java.util.List; import static com.google.gwt.user.client.ui.HasHorizontalAlignment.ALIGN_CENTER; import static de.latlon.xplan.manager.web.client.service.ManagerService.Util.getService; -import static de.latlon.xplan.validator.web.client.report.ReportDownloadFinishedListener.FinishStatus.NEXT; +import static de.latlon.xplanbox.core.gwt.commons.client.report.ReportDownloadFinishedListener.FinishStatus.NEXT; /** * Files system panel of the xplan manager web gui. diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ViewController.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ViewController.java similarity index 98% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ViewController.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ViewController.java index 7d26c5c9d7bf4da33a56707ddd2ca5dda082d8ad..88760356d42d2c29ab9479992a9ba2bacb5bef86 100644 --- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ViewController.java +++ b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/ViewController.java @@ -32,7 +32,7 @@ import de.latlon.xplan.manager.web.client.gui.event.EditorStartedEvent; import de.latlon.xplan.manager.web.client.gui.event.EditorStartedEventHandler; import de.latlon.xplan.manager.web.shared.AuthorizationInfo; import de.latlon.xplan.manager.web.shared.ManagerWebConfiguration; -import de.latlon.xplan.validator.web.shared.ValidationConfig; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationConfig; /** * Controller controlling the main views (like plan list with upload and edit views). diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/CrsDialog.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/CrsDialog.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/CrsDialog.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/CrsDialog.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/CrsSelectedHandler.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/CrsSelectedHandler.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/CrsSelectedHandler.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/CrsSelectedHandler.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/InternalIdDialog.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/InternalIdDialog.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/InternalIdDialog.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/InternalIdDialog.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/LegislationStatusDialog.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/LegislationStatusDialog.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/LegislationStatusDialog.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/LegislationStatusDialog.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/MapPreviewDialog.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/MapPreviewDialog.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/MapPreviewDialog.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/MapPreviewDialog.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/NextSubmittedHandler.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/NextSubmittedHandler.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/NextSubmittedHandler.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/NextSubmittedHandler.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/PlanNameAndStatusDialogBox.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/PlanNameAndStatusDialogBox.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/PlanNameAndStatusDialogBox.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/PlanNameAndStatusDialogBox.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/RasterDialog.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/RasterDialog.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/RasterDialog.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/RasterDialog.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/RasterHandler.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/RasterHandler.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/RasterHandler.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/RasterHandler.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/ValidityPeriodDialog.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/ValidityPeriodDialog.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/ValidityPeriodDialog.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/ValidityPeriodDialog.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/WizardDialogBox.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/WizardDialogBox.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/WizardDialogBox.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/dialog/WizardDialogBox.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/AbstractEditorSubPanelWithTable.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/AbstractEditorSubPanelWithTable.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/AbstractEditorSubPanelWithTable.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/AbstractEditorSubPanelWithTable.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditPlanType.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditPlanType.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditPlanType.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditPlanType.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditVersion.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditVersion.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditVersion.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditVersion.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditorPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditorPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditorPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditorPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditorView.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditorView.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditorView.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/EditorView.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/basedata/BaseDataPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/basedata/BaseDataPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/basedata/BaseDataPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/basedata/BaseDataPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/change/ChangesXplanDialog.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/change/ChangesXplanDialog.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/change/ChangesXplanDialog.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/change/ChangesXplanDialog.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/change/ChangesXplanPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/change/ChangesXplanPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/change/ChangesXplanPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/change/ChangesXplanPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/Code.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/Code.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/Code.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/Code.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/CodelistKey.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/CodelistKey.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/CodelistKey.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/CodelistKey.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/CodelistProvider.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/CodelistProvider.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/CodelistProvider.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/CodelistProvider.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/CodelistType.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/CodelistType.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/CodelistType.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/CodelistType.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/TypeCodelistProvider.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/TypeCodelistProvider.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/TypeCodelistProvider.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/codelist/TypeCodelistProvider.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/EditDialogBox.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/EditDialogBox.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/EditDialogBox.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/EditDialogBox.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/EditDialogBoxWithRasterUpload.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/EditDialogBoxWithRasterUpload.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/EditDialogBoxWithRasterUpload.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/EditDialogBoxWithRasterUpload.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/PreserveExistingFileUpload.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/PreserveExistingFileUpload.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/PreserveExistingFileUpload.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/PreserveExistingFileUpload.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/SavedHandler.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/SavedHandler.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/SavedHandler.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/SavedHandler.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/TypeCodeListBox.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/TypeCodeListBox.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/TypeCodeListBox.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/TypeCodeListBox.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/UrlTextBox.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/UrlTextBox.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/UrlTextBox.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/dialog/UrlTextBox.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/raster/RasterBasisPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/raster/RasterBasisPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/raster/RasterBasisPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/raster/RasterBasisPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/raster/RasterReferenceDialog.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/raster/RasterReferenceDialog.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/raster/RasterReferenceDialog.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/raster/RasterReferenceDialog.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/reference/ReferenceDialog.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/reference/ReferenceDialog.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/reference/ReferenceDialog.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/reference/ReferenceDialog.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/reference/ReferencesPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/reference/ReferencesPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/reference/ReferencesPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/reference/ReferencesPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextDialog.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextDialog.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextDialog.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextDialog.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextsPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextsPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextsPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/text/TextsPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/validityPeriod/ValidityPeriodPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/validityPeriod/ValidityPeriodPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/validityPeriod/ValidityPeriodPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/editor/validityPeriod/ValidityPeriodPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorCanceledEvent.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorCanceledEvent.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorCanceledEvent.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorCanceledEvent.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorCanceledEventHandler.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorCanceledEventHandler.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorCanceledEventHandler.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorCanceledEventHandler.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorFinishedEvent.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorFinishedEvent.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorFinishedEvent.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorFinishedEvent.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorFinishedEventHandler.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorFinishedEventHandler.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorFinishedEventHandler.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorFinishedEventHandler.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorStartedEvent.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorStartedEvent.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorStartedEvent.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorStartedEvent.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorStartedEventHandler.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorStartedEventHandler.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorStartedEventHandler.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/event/EditorStartedEventHandler.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/AbstractFilterPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/AbstractFilterPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/AbstractFilterPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/AbstractFilterPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/CategoryFilterPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/CategoryFilterPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/CategoryFilterPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/CategoryFilterPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/FilterExecutor.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/FilterExecutor.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/FilterExecutor.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/FilterExecutor.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/FilterPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/FilterPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/FilterPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/FilterPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/FilterProvider.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/FilterProvider.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/FilterProvider.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/FilterProvider.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/PlanStatusFilterPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/PlanStatusFilterPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/PlanStatusFilterPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/PlanStatusFilterPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/ResetableFilterPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/ResetableFilterPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/ResetableFilterPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/ResetableFilterPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/SearchFilterPanel.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/SearchFilterPanel.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/SearchFilterPanel.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/filter/SearchFilterPanel.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/utils/ValidationUtils.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/utils/ValidationUtils.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/utils/ValidationUtils.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/utils/ValidationUtils.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/CodeListBox.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/CodeListBox.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/CodeListBox.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/CodeListBox.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/MandatoryTextBox.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/MandatoryTextBox.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/MandatoryTextBox.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/MandatoryTextBox.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/PatternTextArea.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/PatternTextArea.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/PatternTextArea.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/PatternTextArea.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/PatternTextBox.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/PatternTextBox.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/PatternTextBox.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/PatternTextBox.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/StrictDateBox.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/StrictDateBox.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/StrictDateBox.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/StrictDateBox.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/StrictDateBoxFormat.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/StrictDateBoxFormat.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/StrictDateBoxFormat.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/StrictDateBoxFormat.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/TimeBox.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/TimeBox.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/TimeBox.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/TimeBox.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/Validable.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/Validable.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/Validable.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/Validable.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/ValidityPeriodInput.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/ValidityPeriodInput.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/ValidityPeriodInput.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/gui/widget/ValidityPeriodInput.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/i18n/CodelistMessages.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/i18n/CodelistMessages.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/i18n/CodelistMessages.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/i18n/CodelistMessages.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/i18n/DynamicXPlanWebMessages.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/i18n/DynamicXPlanWebMessages.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/i18n/DynamicXPlanWebMessages.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/i18n/DynamicXPlanWebMessages.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/i18n/XPlanWebMessages.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/i18n/XPlanWebMessages.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/i18n/XPlanWebMessages.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/i18n/XPlanWebMessages.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerService.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerService.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerService.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerService.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerWebConfigurationService.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerWebConfigurationService.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerWebConfigurationService.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerWebConfigurationService.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerWebConfigurationServiceAsync.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerWebConfigurationServiceAsync.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerWebConfigurationServiceAsync.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/ManagerWebConfigurationServiceAsync.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/SecurityService.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/SecurityService.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/SecurityService.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/service/SecurityService.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/DateTimeUtils.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/DateTimeUtils.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/DateTimeUtils.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/DateTimeUtils.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtils.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtils.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtils.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtils.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/WmsUrlUtils.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/WmsUrlUtils.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/WmsUrlUtils.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/client/utils/WmsUrlUtils.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/configuration/ManagerWebConfigurationRetriever.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/configuration/ManagerWebConfigurationRetriever.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/configuration/ManagerWebConfigurationRetriever.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/configuration/ManagerWebConfigurationRetriever.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/log/SystemLogListener.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/log/SystemLogListener.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/log/SystemLogListener.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/log/SystemLogListener.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerPlanArchiveManager.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerPlanArchiveManager.java similarity index 98% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerPlanArchiveManager.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerPlanArchiveManager.java index 6b3c4f57ff9c294f64a3181f583b2fda23c86ced..310128b1b748cd3d64178ac288fa99459a1e8062 100644 --- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerPlanArchiveManager.java +++ b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerPlanArchiveManager.java @@ -22,7 +22,7 @@ package de.latlon.xplan.manager.web.server.service; import de.latlon.xplan.commons.util.UnsupportedContentTypeException; import de.latlon.xplan.manager.web.shared.XPlan; -import de.latlon.xplan.validator.web.shared.ValidationException; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationException; import javax.servlet.http.HttpSession; import java.io.File; diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerReportProvider.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerReportProvider.java similarity index 97% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerReportProvider.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerReportProvider.java index 728d371f613877eff6120c697e0fdc689b1518ee..b6d50d22090328b6476da556d00ce7131701b275 100644 --- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerReportProvider.java +++ b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerReportProvider.java @@ -21,7 +21,7 @@ package de.latlon.xplan.manager.web.server.service; import de.latlon.xplan.validator.report.ReportWriter; -import de.latlon.xplan.validator.web.server.service.ReportProvider; +import de.latlon.xplanbox.core.gwt.commons.server.service.ReportProvider; import de.latlon.xplan.validator.web.shared.ArtifactType; import org.springframework.beans.factory.annotation.Autowired; diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerWebConfigurationServiceImpl.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerWebConfigurationServiceImpl.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerWebConfigurationServiceImpl.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/ManagerWebConfigurationServiceImpl.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/XPlanMgrValidationServiceImpl.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/XPlanMgrValidationServiceImpl.java similarity index 93% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/XPlanMgrValidationServiceImpl.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/XPlanMgrValidationServiceImpl.java index 2164c11d12dafabbb48a44d99e86adf55e2ff174..eb2d4456f1b41539a62598f7d4e6795a601b159a 100644 --- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/XPlanMgrValidationServiceImpl.java +++ b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/XPlanMgrValidationServiceImpl.java @@ -28,12 +28,12 @@ import de.latlon.xplan.validator.report.ReportGenerationException; import de.latlon.xplan.validator.report.ReportWriter; import de.latlon.xplan.validator.report.ValidatorReport; import de.latlon.xplan.validator.report.reference.ExternalReferenceStatus; -import de.latlon.xplan.validator.web.client.service.ValidationService; -import de.latlon.xplan.validator.web.server.service.ValidationUtils; -import de.latlon.xplan.validator.web.shared.InvalidParameterException; -import de.latlon.xplan.validator.web.shared.ValidationException; +import de.latlon.xplanbox.core.gwt.commons.client.service.ValidationService; +import de.latlon.xplanbox.core.gwt.commons.server.service.ValidationUtils; +import de.latlon.xplanbox.core.gwt.commons.shared.InvalidParameterException; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationException; import de.latlon.xplan.validator.web.shared.ValidationSettings; -import de.latlon.xplan.validator.web.shared.ValidationSummary; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationSummary; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/component/StringDateConverter.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/component/StringDateConverter.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/component/StringDateConverter.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/component/StringDateConverter.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/ManagerController.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/ManagerController.java similarity index 99% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/ManagerController.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/ManagerController.java index c86595cf5d7b87781507608ecfcaaf4530e2adeb..1a1ff5b0dce0fed42871c923b159ea1cd8161f26 100644 --- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/ManagerController.java +++ b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/ManagerController.java @@ -34,7 +34,7 @@ import de.latlon.xplan.manager.web.shared.Rechtsstand; import de.latlon.xplan.manager.web.shared.RechtsstandAndPlanStatus; import de.latlon.xplan.manager.web.shared.XPlan; import de.latlon.xplan.manager.web.shared.edit.XPlanToEdit; -import de.latlon.xplan.validator.web.shared.InvalidParameterException; +import de.latlon.xplanbox.core.gwt.commons.shared.InvalidParameterException; import org.deegree.commons.utils.Pair; import org.deegree.cs.coordinatesystems.ICRS; import org.deegree.cs.persistence.CRSManager; diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/SecurityController.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/SecurityController.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/SecurityController.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/rest/SecurityController.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/security/AuthorizationManager.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/security/AuthorizationManager.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/security/AuthorizationManager.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/server/service/security/AuthorizationManager.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/ManagerWebConfiguration.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/ManagerWebConfiguration.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/ManagerWebConfiguration.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/ManagerWebConfiguration.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/MapPreviewConfiguration.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/MapPreviewConfiguration.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/MapPreviewConfiguration.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/MapPreviewConfiguration.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/RasterLayerConfiguration.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/RasterLayerConfiguration.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/RasterLayerConfiguration.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/RasterLayerConfiguration.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/RechtsstandAndPlanStatus.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/RechtsstandAndPlanStatus.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/RechtsstandAndPlanStatus.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/RechtsstandAndPlanStatus.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/VectorLayerConfiguration.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/VectorLayerConfiguration.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/VectorLayerConfiguration.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/shared/VectorLayerConfiguration.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/BasicSpringConfig.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/BasicSpringConfig.java similarity index 99% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/BasicSpringConfig.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/BasicSpringConfig.java index 12dfba48cf9448990a0ce322b5453f275dbc2fea..354e0806faaef43a0faa960463b7bfa2b8f92e49 100644 --- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/BasicSpringConfig.java +++ b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/BasicSpringConfig.java @@ -79,7 +79,7 @@ import de.latlon.xplan.validator.semantic.profile.SemanticProfilesCreator; 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.xplan.validator.web.server.service.ReportProvider; +import de.latlon.xplanbox.core.gwt.commons.server.service.ReportProvider; import org.deegree.commons.config.DeegreeWorkspace; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/ManagerWebSpringConfig.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/ManagerWebSpringConfig.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/ManagerWebSpringConfig.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/ManagerWebSpringConfig.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/ManagerWebSpringConfigWithAdLdapSecurity.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/ManagerWebSpringConfigWithAdLdapSecurity.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/ManagerWebSpringConfigWithAdLdapSecurity.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/ManagerWebSpringConfigWithAdLdapSecurity.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/ManagerWebSpringConfigWithSimpleSecurity.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/ManagerWebSpringConfigWithSimpleSecurity.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/ManagerWebSpringConfigWithSimpleSecurity.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/ManagerWebSpringConfigWithSimpleSecurity.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/XPlanManagerWebContextConfig.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/XPlanManagerWebContextConfig.java similarity index 95% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/XPlanManagerWebContextConfig.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/XPlanManagerWebContextConfig.java index 7237dd132b17d025d227259582a067717a861a7e..16206dff007778b9d1e4a69eada5de6596b38b7f 100644 --- a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/XPlanManagerWebContextConfig.java +++ b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/config/XPlanManagerWebContextConfig.java @@ -33,7 +33,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; */ @Configuration @EnableWebMvc -@ComponentScan(basePackages = { "de.latlon.xplan.validator.web.server.service", +@ComponentScan(basePackages = { "de.latlon.xplanbox.core.gwt.commons.server.service", "de.latlon.xplan.manager.web.server.service.rest" }) public class XPlanManagerWebContextConfig implements WebMvcConfigurer { diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryGrantedAuthoritiesMapper.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryGrantedAuthoritiesMapper.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryGrantedAuthoritiesMapper.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryGrantedAuthoritiesMapper.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryRoleHierarchyScanner.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryRoleHierarchyScanner.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryRoleHierarchyScanner.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryRoleHierarchyScanner.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/DistrictGrantedAuthority.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/DistrictGrantedAuthority.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/DistrictGrantedAuthority.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/DistrictGrantedAuthority.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/DistrictPermission.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/DistrictPermission.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/DistrictPermission.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/DistrictPermission.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/ManagerPermissionEvaluator.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/ManagerPermissionEvaluator.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/ManagerPermissionEvaluator.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/ManagerPermissionEvaluator.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/Permission.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/Permission.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/Permission.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/Permission.java diff --git a/xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/XPlanAuthorizationRole.java b/xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/XPlanAuthorizationRole.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/XPlanAuthorizationRole.java rename to xplan-manager/xplan-manager-web/src/main/java/de/latlon/xplan/manager/web/spring/security/XPlanAuthorizationRole.java diff --git a/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/XPlanMgrWeb.gwt.xml b/xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/XPlanMgrWeb.gwt.xml similarity index 92% rename from xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/XPlanMgrWeb.gwt.xml rename to xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/XPlanMgrWeb.gwt.xml index 8aba1b2d3fb979aedac128f1b768d2a77dcb4f5d..4acb8b9376ad6162036d6a918cadcb3ed2ac31d5 100644 --- a/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/XPlanMgrWeb.gwt.xml +++ b/xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/XPlanMgrWeb.gwt.xml @@ -39,8 +39,9 @@ <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> --> <!-- Other module inherits --> - <inherits name='de.latlon.xplan.commons.XPlanCommonsWeb'/> - <inherits name='de.latlon.xplan.validator.web.XPlanValidatorWebCommons'/> + <inherits name='de.latlon.xplan.manager.XPlanManagerCore'/> + <inherits name='de.latlon.xplan.validator.XPlanValidatorCore'/> + <inherits name='de.latlon.xplanbox.core.gwt.commons.XPlanCommons'/> <inherits name='org.gwtopenmaps.openlayers.OpenLayers'/> <inherits name='org.fusesource.restygwt.RestyGWT' /> diff --git a/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/client/i18n/CodelistMessages.properties b/xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/client/i18n/CodelistMessages.properties similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/client/i18n/CodelistMessages.properties rename to xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/client/i18n/CodelistMessages.properties diff --git a/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/client/i18n/DynamicXPlanWebMessages.properties b/xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/client/i18n/DynamicXPlanWebMessages.properties similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/client/i18n/DynamicXPlanWebMessages.properties rename to xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/client/i18n/DynamicXPlanWebMessages.properties diff --git a/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/client/i18n/XPlanWebMessages.properties b/xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/client/i18n/XPlanWebMessages.properties similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/client/i18n/XPlanWebMessages.properties rename to xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/client/i18n/XPlanWebMessages.properties diff --git a/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/server/configuration/managerWebConfiguration.properties b/xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/server/configuration/managerWebConfiguration.properties similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/server/configuration/managerWebConfiguration.properties rename to xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/server/configuration/managerWebConfiguration.properties diff --git a/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/spring/security-ad.xml b/xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/spring/security-ad.xml similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/spring/security-ad.xml rename to xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/spring/security-ad.xml diff --git a/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/spring/security-core.xml b/xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/spring/security-core.xml similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/spring/security-core.xml rename to xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/spring/security-core.xml diff --git a/xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/spring/security-simple.xml b/xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/spring/security-simple.xml similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/spring/security-simple.xml rename to xplan-manager/xplan-manager-web/src/main/resources/de/latlon/xplan/manager/web/spring/security-simple.xml diff --git a/xplan-webapps/xplan-manager-web/src/main/resources/log4j2.yaml b/xplan-manager/xplan-manager-web/src/main/resources/log4j2.yaml similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/resources/log4j2.yaml rename to xplan-manager/xplan-manager-web/src/main/resources/log4j2.yaml diff --git a/xplan-webapps/xplan-manager-web/src/main/resources/security-configuration.xml b/xplan-manager/xplan-manager-web/src/main/resources/security-configuration.xml similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/resources/security-configuration.xml rename to xplan-manager/xplan-manager-web/src/main/resources/security-configuration.xml diff --git a/xplan-webapps/xplan-manager-web/src/main/resources/security.properties b/xplan-manager/xplan-manager-web/src/main/resources/security.properties similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/resources/security.properties rename to xplan-manager/xplan-manager-web/src/main/resources/security.properties diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/WEB-INF/web.xml b/xplan-manager/xplan-manager-web/src/main/webapp/WEB-INF/web.xml similarity index 97% rename from xplan-webapps/xplan-manager-web/src/main/webapp/WEB-INF/web.xml rename to xplan-manager/xplan-manager-web/src/main/webapp/WEB-INF/web.xml index 3fe96201190b445daeaad4361e286e8a7f3da54a..f40738a9aa8426fef7167e2bb3a0fe90ec0a586e 100644 --- a/xplan-webapps/xplan-manager-web/src/main/webapp/WEB-INF/web.xml +++ b/xplan-manager/xplan-manager-web/src/main/webapp/WEB-INF/web.xml @@ -57,7 +57,7 @@ </servlet> <servlet> <servlet-name>xplanvalidatorwebValidationconfigService</servlet-name> - <servlet-class>de.latlon.xplan.validator.web.server.service.DefaultValidationConfigService</servlet-class> + <servlet-class>de.latlon.xplanbox.core.gwt.commons.server.service.DefaultValidationConfigService</servlet-class> </servlet> <servlet> <servlet-name>xplanmgrwebrest</servlet-name> diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/XPlanMgrWeb.css b/xplan-manager/xplan-manager-web/src/main/webapp/XPlanMgrWeb.css similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/XPlanMgrWeb.css rename to xplan-manager/xplan-manager-web/src/main/webapp/XPlanMgrWeb.css diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/datepicker.css b/xplan-manager/xplan-manager-web/src/main/webapp/datepicker.css similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/datepicker.css rename to xplan-manager/xplan-manager-web/src/main/webapp/datepicker.css diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/favicon.ico b/xplan-manager/xplan-manager-web/src/main/webapp/favicon.ico similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/favicon.ico rename to xplan-manager/xplan-manager-web/src/main/webapp/favicon.ico diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/index.html b/xplan-manager/xplan-manager-web/src/main/webapp/index.html similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/index.html rename to xplan-manager/xplan-manager-web/src/main/webapp/index.html diff --git a/xplan-webapps/xplan-root/src/main/resources/latilong.png b/xplan-manager/xplan-manager-web/src/main/webapp/latilong.png similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/latilong.png rename to xplan-manager/xplan-manager-web/src/main/webapp/latilong.png diff --git a/xplan-webapps/xplan-root/src/main/resources/latlon_logo_schriftzug.png b/xplan-manager/xplan-manager-web/src/main/webapp/latlon_logo_schriftzug.png similarity index 100% rename from xplan-webapps/xplan-root/src/main/resources/latlon_logo_schriftzug.png rename to xplan-manager/xplan-manager-web/src/main/webapp/latlon_logo_schriftzug.png diff --git a/xplan-api/xplan-api-validator/src/main/webapp/xvalidator/version.txt b/xplan-manager/xplan-manager-web/src/main/webapp/version.txt similarity index 100% rename from xplan-api/xplan-api-validator/src/main/webapp/xvalidator/version.txt rename to xplan-manager/xplan-manager-web/src/main/webapp/version.txt diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/img/download.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/img/download.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/img/download.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/img/download.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/img/edit.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/img/edit.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/img/edit.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/img/edit.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/img/preview.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/img/preview.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/img/preview.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/img/preview.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/img/publishplu.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/img/publishplu.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/img/publishplu.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/img/publishplu.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/img/remove.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/img/remove.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/img/remove.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/img/remove.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/OpenLayers.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/OpenLayers.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/OpenLayers.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/OpenLayers.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/blank.gif b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/blank.gif similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/blank.gif rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/blank.gif diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/cloud-popup-relative.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/cloud-popup-relative.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/cloud-popup-relative.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/cloud-popup-relative.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/drag-rectangle-off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/drag-rectangle-off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/drag-rectangle-off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/drag-rectangle-off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/drag-rectangle-on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/drag-rectangle-on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/drag-rectangle-on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/drag-rectangle-on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/east-mini.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/east-mini.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/east-mini.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/east-mini.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/layer-switcher-maximize.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/layer-switcher-maximize.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/layer-switcher-maximize.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/layer-switcher-maximize.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/layer-switcher-minimize.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/layer-switcher-minimize.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/layer-switcher-minimize.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/layer-switcher-minimize.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker-blue.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker-blue.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker-blue.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker-blue.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker-gold.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker-gold.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker-gold.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker-gold.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker-green.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker-green.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker-green.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker-green.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/marker.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/measuring-stick-off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/measuring-stick-off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/measuring-stick-off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/measuring-stick-off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/measuring-stick-on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/measuring-stick-on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/measuring-stick-on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/measuring-stick-on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/north-mini.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/north-mini.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/north-mini.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/north-mini.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/panning-hand-off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/panning-hand-off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/panning-hand-off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/panning-hand-off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/panning-hand-on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/panning-hand-on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/panning-hand-on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/panning-hand-on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/slider.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/slider.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/slider.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/slider.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/south-mini.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/south-mini.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/south-mini.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/south-mini.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/west-mini.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/west-mini.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/west-mini.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/west-mini.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoom-minus-mini.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoom-minus-mini.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoom-minus-mini.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoom-minus-mini.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoom-plus-mini.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoom-plus-mini.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoom-plus-mini.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoom-plus-mini.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoom-world-mini.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoom-world-mini.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoom-world-mini.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoom-world-mini.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoombar.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoombar.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoombar.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/img/zoombar.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/license.txt b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/license.txt similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/license.txt rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/license.txt diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/framedCloud.css b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/framedCloud.css similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/framedCloud.css rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/framedCloud.css diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/ie6-style.css b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/ie6-style.css similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/ie6-style.css rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/ie6-style.css diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/add_point_off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/add_point_off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/add_point_off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/add_point_off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/add_point_on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/add_point_on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/add_point_on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/add_point_on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/blank.gif b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/blank.gif similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/blank.gif rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/blank.gif diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/close.gif b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/close.gif similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/close.gif rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/close.gif diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/drag-rectangle-off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/drag-rectangle-off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/drag-rectangle-off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/drag-rectangle-off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/drag-rectangle-on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/drag-rectangle-on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/drag-rectangle-on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/drag-rectangle-on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_line_off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_line_off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_line_off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_line_off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_line_on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_line_on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_line_on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_line_on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_point_off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_point_off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_point_off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_point_off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_point_on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_point_on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_point_on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_point_on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_polygon_off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_polygon_off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_polygon_off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_polygon_off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_polygon_on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_polygon_on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_polygon_on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/draw_polygon_on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/editing_tool_bar.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/editing_tool_bar.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/editing_tool_bar.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/editing_tool_bar.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/move_feature_off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/move_feature_off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/move_feature_off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/move_feature_off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/move_feature_on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/move_feature_on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/move_feature_on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/move_feature_on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/navigation_history.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/navigation_history.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/navigation_history.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/navigation_history.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/overview_replacement.gif b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/overview_replacement.gif similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/overview_replacement.gif rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/overview_replacement.gif diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan-panel-NOALPHA.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan-panel-NOALPHA.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan-panel-NOALPHA.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan-panel-NOALPHA.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan-panel.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan-panel.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan-panel.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan-panel.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan_off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan_off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan_off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan_off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan_on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan_on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan_on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/pan_on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/panning-hand-off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/panning-hand-off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/panning-hand-off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/panning-hand-off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/panning-hand-on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/panning-hand-on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/panning-hand-on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/panning-hand-on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/remove_point_off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/remove_point_off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/remove_point_off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/remove_point_off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/remove_point_on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/remove_point_on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/remove_point_on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/remove_point_on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/save_features_off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/save_features_off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/save_features_off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/save_features_off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/save_features_on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/save_features_on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/save_features_on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/save_features_on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_next_off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_next_off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_next_off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_next_off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_next_on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_next_on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_next_on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_next_on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_previous_off.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_previous_off.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_previous_off.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_previous_off.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_previous_on.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_previous_on.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_previous_on.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/view_previous_on.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/zoom-panel-NOALPHA.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/zoom-panel-NOALPHA.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/zoom-panel-NOALPHA.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/zoom-panel-NOALPHA.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/zoom-panel.png b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/zoom-panel.png similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/zoom-panel.png rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/img/zoom-panel.png diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/style.css b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/style.css similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/style.css rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/OpenLayers-2.7/theme/default/style.css diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG102067.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG102067.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG102067.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG102067.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG102757.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG102757.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG102757.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG102757.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG102758.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG102758.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG102758.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG102758.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG21781.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG21781.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG21781.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG21781.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG25832.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG25832.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG25832.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG25832.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG25833.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG25833.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG25833.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG25833.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG26591.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG26591.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG26591.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG26591.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG26912.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG26912.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG26912.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG26912.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG27200.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG27200.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG27200.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG27200.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG27563.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG27563.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG27563.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG27563.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG31466.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG31466.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG31466.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG31466.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG31467.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG31467.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG31467.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG31467.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG31468.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG31468.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG31468.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG31468.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG41001.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG41001.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG41001.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG41001.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4139.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4139.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4139.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4139.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4181.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4181.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4181.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4181.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG42304.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG42304.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG42304.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG42304.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4272.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4272.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4272.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4272.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4302.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4302.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4302.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG4302.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG900913.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG900913.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG900913.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG900913.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG900913.txt b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG900913.txt similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG900913.txt rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/EPSG900913.txt diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/GOOGLE.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/GOOGLE.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/GOOGLE.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/defs/GOOGLE.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/proj4js-combined.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/proj4js-combined.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/proj4js-combined.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/proj4js-combined.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/proj4js-compressed.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/proj4js-compressed.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/proj4js-compressed.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/proj4js-compressed.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/proj4js.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/proj4js.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/proj4js.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/proj4js.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/aea.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/aea.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/aea.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/aea.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/aeqd.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/aeqd.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/aeqd.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/aeqd.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/cass.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/cass.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/cass.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/cass.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/cea.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/cea.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/cea.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/cea.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/eqc.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/eqc.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/eqc.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/eqc.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/eqdc.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/eqdc.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/eqdc.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/eqdc.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/equi.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/equi.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/equi.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/equi.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/gauss.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/gauss.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/gauss.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/gauss.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/gnom.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/gnom.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/gnom.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/gnom.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/gstmerc.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/gstmerc.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/gstmerc.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/gstmerc.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/krovak.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/krovak.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/krovak.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/krovak.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/laea.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/laea.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/laea.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/laea.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/lcc.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/lcc.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/lcc.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/lcc.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/merc.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/merc.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/merc.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/merc.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/mill.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/mill.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/mill.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/mill.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/moll.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/moll.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/moll.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/moll.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/nzmg.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/nzmg.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/nzmg.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/nzmg.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/omerc.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/omerc.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/omerc.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/omerc.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/ortho.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/ortho.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/ortho.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/ortho.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/poly.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/poly.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/poly.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/poly.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/sinu.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/sinu.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/sinu.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/sinu.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/somerc.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/somerc.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/somerc.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/somerc.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/stere.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/stere.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/stere.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/stere.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/sterea.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/sterea.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/sterea.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/sterea.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/tmerc.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/tmerc.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/tmerc.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/tmerc.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/utm.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/utm.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/utm.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/utm.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/vandg.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/vandg.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/vandg.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/projCode/vandg.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/util/MGRS.js b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/util/MGRS.js similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/util/MGRS.js rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/lib/util/MGRS.js diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/license.txt b/xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/license.txt similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/license.txt rename to xplan-manager/xplan-manager-web/src/main/webapp/xplanmgrweb/js/proj4/proj4js/license.txt diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/comparator/AlphanumericComparatorTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/comparator/AlphanumericComparatorTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/comparator/AlphanumericComparatorTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/comparator/AlphanumericComparatorTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/comparator/ColumnComparatorTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/comparator/ColumnComparatorTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/comparator/ColumnComparatorTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/comparator/ColumnComparatorTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/filter/CategoryFilterTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/filter/CategoryFilterTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/filter/CategoryFilterTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/filter/CategoryFilterTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/filter/FreeTextFilterTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/filter/FreeTextFilterTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/filter/FreeTextFilterTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/filter/FreeTextFilterTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/filter/PlanStatusFilterTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/filter/PlanStatusFilterTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/filter/PlanStatusFilterTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/filter/PlanStatusFilterTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/DateTimeUtilsTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/DateTimeUtilsTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/DateTimeUtilsTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/DateTimeUtilsTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtilsTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtilsTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtilsTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/ReferenceNameUtilsTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/WmsUrlUtilsTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/WmsUrlUtilsTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/WmsUrlUtilsTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/client/utils/WmsUrlUtilsTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/configuration/ManagerWebConfigurationRetrieverTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/configuration/ManagerWebConfigurationRetrieverTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/configuration/ManagerWebConfigurationRetrieverTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/configuration/ManagerWebConfigurationRetrieverTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/configuration/ManagerWebConfigurationServiceImplTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/configuration/ManagerWebConfigurationServiceImplTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/configuration/ManagerWebConfigurationServiceImplTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/configuration/ManagerWebConfigurationServiceImplTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/rest/ManagerControllerTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/rest/ManagerControllerTest.java similarity index 97% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/rest/ManagerControllerTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/rest/ManagerControllerTest.java index d4b96c0433187f4c260656a908cc76e824c7d06c..9ec1091d572c351e96ef921966a453b6638015d0 100644 --- a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/rest/ManagerControllerTest.java +++ b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/rest/ManagerControllerTest.java @@ -24,7 +24,7 @@ import de.latlon.xplan.manager.XPlanManager; import de.latlon.xplan.manager.web.shared.XPlan; import de.latlon.xplan.manager.web.spring.config.TestConfig; import de.latlon.xplan.manager.web.spring.config.XPlanManagerWebContextConfig; -import de.latlon.xplan.validator.web.server.service.ReportProvider; +import de.latlon.xplanbox.core.gwt.commons.server.service.ReportProvider; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/rest/SecurityControllerTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/rest/SecurityControllerTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/rest/SecurityControllerTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/rest/SecurityControllerTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/security/AuthorizationManagerTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/security/AuthorizationManagerTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/security/AuthorizationManagerTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/server/service/security/AuthorizationManagerTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/config/TestConfig.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/config/TestConfig.java similarity index 96% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/config/TestConfig.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/config/TestConfig.java index 1cb9a53c88aaf057fc5223c5e83ea6edf075ec01..bc3bd42ea59469512ff1611bd0a43b9b808192c7 100644 --- a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/config/TestConfig.java +++ b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/config/TestConfig.java @@ -23,7 +23,7 @@ package de.latlon.xplan.manager.web.spring.config; import de.latlon.xplan.manager.XPlanManager; import de.latlon.xplan.manager.internalid.InternalIdRetriever; import de.latlon.xplan.manager.web.server.service.security.AuthorizationManager; -import de.latlon.xplan.validator.web.server.service.ReportProvider; +import de.latlon.xplanbox.core.gwt.commons.server.service.ReportProvider; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryGrantedAuthoritiesMapperTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryGrantedAuthoritiesMapperTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryGrantedAuthoritiesMapperTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryGrantedAuthoritiesMapperTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryRoleHierarchyScannerTestManual.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryRoleHierarchyScannerTestManual.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryRoleHierarchyScannerTestManual.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/ActiveDirectoryRoleHierarchyScannerTestManual.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/DistrictPermissionTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/DistrictPermissionTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/DistrictPermissionTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/DistrictPermissionTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/ManagerPermissionEvaluatorTest.java b/xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/ManagerPermissionEvaluatorTest.java similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/ManagerPermissionEvaluatorTest.java rename to xplan-manager/xplan-manager-web/src/test/java/de/latlon/xplan/manager/web/spring/security/ManagerPermissionEvaluatorTest.java diff --git a/xplan-webapps/xplan-manager-web/src/test/resources/log4j2-test.yaml b/xplan-manager/xplan-manager-web/src/test/resources/log4j2-test.yaml similarity index 100% rename from xplan-webapps/xplan-manager-web/src/test/resources/log4j2-test.yaml rename to xplan-manager/xplan-manager-web/src/test/resources/log4j2-test.yaml diff --git a/xplan-tests/pom.xml b/xplan-tests/pom.xml index 59a8ec949bad5f5448082f28181a15351984bf66..97e51a3824b9e14142492f67e70466ac43e6d829 100644 --- a/xplan-tests/pom.xml +++ b/xplan-tests/pom.xml @@ -17,7 +17,6 @@ </properties> <modules> - <module>xplan-tests-resources</module> <module>xplan-tests-soapui</module> <module>xplan-tests-manual</module> <module>xplan-tests-selenium</module> diff --git a/xplan-tests/xplan-tests-manual/src/main/resources/xPlanBox-testplan.md b/xplan-tests/xplan-tests-manual/src/main/resources/xPlanBox-testplan.md index 65d5981191824aadf563b294ab3be8627650763a..8f3cd472de11049066fbe8cec3fc803b0579cfe7 100644 --- a/xplan-tests/xplan-tests-manual/src/main/resources/xPlanBox-testplan.md +++ b/xplan-tests/xplan-tests-manual/src/main/resources/xPlanBox-testplan.md @@ -700,7 +700,7 @@ Schritt | Beschreibung | Erwartetes Ergebnis **Hinweis** * [1] `./sortDateUpdate` -* [2] `.deegree/xplansyn-wms-workspace/themes/bplanraster.xml` +* [2] `.deegree/xplan-services-wms-workspace/themes/bplanraster.xml` * Der Pfad kann variieren. # 7. XPlanTransformCLI diff --git a/xplan-tests/xplan-tests-resources/LICENSE_UNKNOWN.txt b/xplan-tests/xplan-tests-resources/LICENSE_UNKNOWN.txt deleted file mode 100644 index 7efa6a2fac7402c603140098ad96aae99aab555b..0000000000000000000000000000000000000000 --- a/xplan-tests/xplan-tests-resources/LICENSE_UNKNOWN.txt +++ /dev/null @@ -1,88 +0,0 @@ -Hinweis: -======== - -Die in diesem Verzeichnis abgelegten XPlanArchive und XPlanGML-Dateien werden zu Testzwecken verwendet. Zu einigen -Dateien können keine genaueren Angaben zur Quelle und zu etwaigen Nutzungsrechten angegeben werden. Eine Weitergabe an -Dritte ausser zu Testzwecken der Anwendung xPlanBox ist nicht gestattet. - -Inhalt des Verzeichnisses src/main/resources: --------------------------- -└── de - └── latlon - └── xplan - ├── hale - │  └── xplan41nach51 - │  └── V4_1_ID_103.gml - ├── xplan40 - │  └── BPlan004_4-0.zip - ├── xplan41 - │  ├── BP2070-detailierteArtDerBaulNutzung.zip - │  ├── BP2070-storedQuery-3000.zip - │  ├── BP2070-storedQuery.zip - │  ├── BP2070.zip - │  ├── BP2135.zip - │  ├── BPlan001_4-1_Bereiche.zip - │  ├── BPlan001_4-1.zip - │  ├── BPlan004_4-1.zip - │  ├── Demo-storedQuery-5000.zip - │  ├── Demo-storedQuery.zip - │  ├── Demo.zip - │  ├── Eidelstedt_4_V4-320.zip - │  ├── Eidelstedt_4_V4-Blankenese.zip - │  ├── Eidelstedt_4_V4-broken-geometry.zip - │  ├── Eidelstedt_4_V4-Eimsbuettel.zip - │  ├── Eidelstedt_4_V4-newer-release-date.zip - │  ├── Eidelstedt_4_V4_noCrs.zip - │  ├── Eidelstedt_4_V4-older-release-date.zip - │  ├── Eidelstedt_4_V4_Senatsbplan.zip - │  ├── Eidelstedt_4_V4_Syntaxfehler.zip - │  ├── Eidelstedt_4_V4-wrongGmlFileName.zip - │  ├── Eidelstedt_4_V4.zip - │  ├── Erhaltung.zip - │  ├── FPlan-with-wirksamkeitsDatum.zip - │  ├── FPlan.zip - │  ├── hc7_bereich_2_V4.zip - │  ├── LA22.zip - │  ├── LA67.zip - │  └── PlanWithComplexCurve.zip - ├── xplan50 - │  ├── BP2070.zip - │  ├── BP2135.zip - │  ├── BPlan002_5-0.zip - │  ├── BPlan004_5-0.zip - │  ├── Demo.zip - │  ├── FPlan.zip - │  ├── LA22.zip - │  └── LA67.zip - ├── xplan51 - │  ├── BP2070_mehrererOrtsteile.zip - │  ├── BP2070.zip - │  ├── BP2135.zip - │  ├── BPlan001_5-1.gml - │  ├── BPlan001_5-1.zip - │  ├── BPlan002_5-1_rasterBasisAlsRefScan.zip - │  ├── BPlan002_5-1.zip - │  ├── BPlan004_5-1.zip - │  ├── FPlan.zip - │  ├── LA22.zip - │  ├── LA67.zip - │  ├── RROP_Landkreis_Test_51.zip - │  └── StErhVO_Heidberg_51.zip - ├── xplan52 - │  ├── BP2070.zip - │  ├── BP2135.zip - │  ├── BPlan001_5-2_Bereiche.zip - │  ├── BPlan002_5-3.zip - │  ├── BPlan004_5-2.zip - │  ├── LA22.zip - │  └── LA67.zip - └── xplan60 - ├── Blankenese29.gml - ├── Blankenese29_Test_60.zip - ├── BPlan001_6-0.zip - ├── BPlan002_6-0.zip - ├── BPlan004_6-0.zip - ├── FNP_Test_60.zip - ├── LP-Test_60.zip - ├── StErhVO_Hamm_60_httpRef.gml - └── StErhVO_Hamm_60.zip diff --git a/xplan-tests/xplan-tests-resources/pom.xml b/xplan-tests/xplan-tests-resources/pom.xml deleted file mode 100644 index b4d01c02ff00d810bb3d2b4bb269e3b68e2440c4..0000000000000000000000000000000000000000 --- a/xplan-tests/xplan-tests-resources/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?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-tests-resources</artifactId> - <packaging>jar</packaging> - <description>Ressourcen fuer JUnit- und Integrationstests</description> - - <parent> - <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-tests</artifactId> - <version>7.2-SNAPSHOT</version> - </parent> - -</project> \ No newline at end of file diff --git a/xplan-tests/xplan-tests-resources/src/main/java/de/latlon/xplan/ResourceAccessor.java b/xplan-tests/xplan-tests-resources/src/main/java/de/latlon/xplan/ResourceAccessor.java deleted file mode 100644 index 67ab6e6a974e7e0c8bb50ac96b9375a8788d23af..0000000000000000000000000000000000000000 --- a/xplan-tests/xplan-tests-resources/src/main/java/de/latlon/xplan/ResourceAccessor.java +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * #%L - * xplan-tests-resources - Ressourcen fuer JUnit- und Integrationstests - * %% - * Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should 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; - -import java.io.InputStream; - -/** - * Convenient access to resources in this module - * - * @author <a href="mailto:erben@lat-lon.de">Alexander Erben</a> - * @version $Revision: $, $Date: $ - */ -public class ResourceAccessor { - - private ResourceAccessor() { - } - - /** - * Retrieves the resource identified by name - * @param name the file name of the resource - * @return an <link>InputStream</link> for the contents of the file - */ - public static InputStream readResourceStream(String name) { - return ResourceAccessor.class.getResourceAsStream(name); - } - -} diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/hale/xplan41nach51/V4_1_ID_103.gml b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/hale/xplan41nach51/V4_1_ID_103.gml deleted file mode 100644 index bf4d980c0ed7bf501c4643a7b0f601a112eb47f1..0000000000000000000000000000000000000000 --- a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/hale/xplan41nach51/V4_1_ID_103.gml +++ /dev/null @@ -1,11848 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<!-- - #%L - xplan-tests-resources - Ressourcen fuer JUnit- und Integrationstests - %% - Copyright (C) 2008 - 2023 Freie und Hansestadt Hamburg, developed by lat/lon gesellschaft für raumbezogene Informationssysteme mbH - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> - -<!--Erzeugt mit KIT (www.kit.edu) XPlanGML-Toolbox, Erstellungsdatum: 06/10/13 --> -<xplan:XPlanAuszug xmlns:adv="http://www.adv-online.de/nas" - xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xplan="http://www.xplanung.de/xplangml/4/1" - xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.xplanung.de/xplangml/4/1 ../../../../../../../../../../xplan-resources/xplan-schemas/src/main/resources/appschemas/XPlanGML_4_1/XPlanung-Operationen.xsd" - xmlns:wfs="http://www.opengis.net/wfs" gml:id="GML_597bdedb-0d50-41f9-9cd3-e021ee53e2e9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_01724502-724c-4e01-ba12-d2e087d87736"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:textSchluessel>Text textSchluessel</xplan:textSchluessel> - <xplan:textSchluesselBegruendung>Text textSchluesselBegruendung</xplan:textSchluesselBegruendung> - <xplan:informell> - <xplan:XP_ExterneReferenz> - <xplan:referenzName>Informell</xplan:referenzName> - <xplan:referenzURL>Informell_Text.pdf</xplan:referenzURL> - </xplan:XP_ExterneReferenz> - </xplan:informell> - <xplan:rechtscharakter>1000</xplan:rechtscharakter> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9e02e44c-798e-4e4f-8cc5-1c5cd37dd071"> - <gml:pos>417994.899 5715893.979</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_05915fe5-fc8c-420d-90da-ff71bad29cc5"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e412cafa-1092-4fa6-8b1c-4258c1b89d12"> - <gml:pos>418002.262 5715897.203</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_05ad0484-0015-4d0a-b719-8583ff36690f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_7a40cfa4-713f-4f0f-b5ca-1bda39891fd0"> - <gml:pos>418281.841 5715915.932</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_0b00a561-2269-4993-8719-5bbe635c6dc7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_6fd4ee3c-84b5-4932-9a4e-4cd449bed3bd"> - <gml:pos>418166.423 5715714.059</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_0dd4c31b-3818-47af-be9b-1bb7e119d74b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_7629f1e8-6c61-46e3-906c-979f26883e0d"> - <gml:pos>418407.061 5715769.791</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_0e239322-c8b6-4956-8282-2c9575bf01a4"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_da44e94a-70a5-4947-9b6e-12cc92bb27c3"> - <gml:pos>417971.444 5715832.147</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_0e48ce56-2631-4dfd-b35d-33be642f092b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_a24c839f-3db6-48a6-a451-1af05caf54d3"> - <gml:pos>418459.002 5715901.115</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_0f2b06b3-98f7-4e49-9cf0-39e987cb0315"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_2c7013e5-4f0a-4817-841b-1e32bf7cdd65"> - <gml:pos>418403.196 5715761.289</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_0fdd4093-9a3e-449c-93b7-5af70d0ab774"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e06ef2bc-7f3b-444f-a6be-866b197a3711"> - <gml:pos>418391.806 5715803.118</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_1445a560-4206-4c5d-a0e7-f7421f7becce"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_4b0bf244-fe59-499e-b63a-17a0c7c3ac9c"> - <gml:pos>418391.817 5715935.822</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_14c2c6bc-21b1-416e-92d9-123bbe8b6034"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c98fad5e-0fba-482b-9edd-6b99cdf3bdc8"> - <gml:pos>418378.561 5716005.403</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_18b36f7d-94ed-4f1d-b75e-8b32c34abca5"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_f4bf0cf3-d8cf-4600-8324-3cec7a2b41ab"> - <gml:pos>418169.111 5715713.027</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_1a455704-84c0-4215-b188-8d9b9920f8da"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_90b95112-1919-4990-bf8c-293245fa8415"> - <gml:pos>418049.179 5715895.753</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_1cc16f65-20c7-45f0-92f7-23856103ecf7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_cbb5b926-ac57-4818-9d8c-7de898354860"> - <gml:pos>418269.989 5715926.316</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_1e3e4a7a-452c-4c13-973c-a8db2a6c8c19"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_23a9c09e-ea7f-4fb3-af64-cd44c3c129d6"> - <gml:pos>418144.373 5715923.895</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_1e95ec8d-3bfb-42ea-bc05-8b3be6bdd84d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_660a81ff-0065-4be3-a882-38dfaf837164"> - <gml:pos>418243.02 5715906.671</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_1e98d860-d6ad-44c7-8093-cb9e3b1ee5ac"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_2be984e0-dc13-412c-b7e0-9c762d3116cf"> - <gml:pos>418398.573 5715802.694</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_20437b8b-75b4-4108-86c3-e8a94984b4ee"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d01f4fdc-f06f-438c-a8e0-a61b3af1c0ab"> - <gml:pos>418157.52 5715692.363</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_21fcb09d-da45-43c6-bc90-6818cbae2ad4"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_8c64bc4b-a2ac-4fca-a111-8d003c4a924f"> - <gml:pos>418292.711 5715977.689</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_23df0455-dfc0-4dc8-a0f7-44552314b843"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_717c1601-adeb-46bc-991f-0cc94483bd06"> - <gml:pos>418170.162 5715713.341</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_256f154d-45ca-42a7-a4f9-7f0102d19aa1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_b24f0d0f-3302-46f5-86dc-88ba8df2a506"> - <gml:pos>418165.512 5715708.831</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_278e9068-da28-4434-9354-ebf271c1d62c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_68c5df83-dc5d-4807-bfaa-71b3bd9af734"> - <gml:pos>418169.249 5715703.954</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_287a2c93-bce5-4f54-9726-06b5db90018c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_75c2d1aa-aeb2-43ce-bd62-c4053c6544bf"> - <gml:pos>418330.383 5715927.515</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_29c0fc88-d378-4775-9c65-a48159e0236f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c19e25be-2452-4a55-bd56-f9d3901a3ec8"> - <gml:pos>418441.872 5715932.545</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_2c3b1999-d2be-492e-837b-5bd2b51eb9ef"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9283b62a-6033-4af9-810a-29abee9426c7"> - <gml:pos>418501.586 5715928.458</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_2c547146-ad4d-4b50-9ce3-6afd765dda79"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_1f2ba638-f657-48c7-a2ec-c912ae57020f"> - <gml:pos>417990.83 5715946.816</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_2c94f717-ac6a-4461-86d4-1972dca3a3c9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_5ac1321e-bd0a-4586-85dc-2005b9049367"> - <gml:pos>418137.245 5715910.662</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_2f3b1406-a7d8-4e86-b568-02f20b5bb8e5"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c4e2f4cf-a69c-45a2-97e6-26b88e8ba147"> - <gml:pos>418165.114 5715888.226</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_2f97a641-43b0-4eeb-ab03-b32327f61126"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_dc2ac425-7dab-438b-a4bd-0c237340b97e"> - <gml:pos>418477.642 5715919.448</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_3255aa7b-0412-4a3f-b842-5b87e7ed40b4"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_7ffeef1f-34d3-4f9e-bd05-7edf808942d9"> - <gml:pos>418340.135 5715929.809</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_330317d4-347c-44bb-9bb7-f06fe828fe6d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_cbfbfbbb-7fcf-418a-a65c-7bba8dfba7d1"> - <gml:pos>418120.562 5715890.467</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_342b956b-43ba-4f05-ad9a-47c5921a824e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_25bc13ed-35f0-42f1-8be7-d9fb58914af9"> - <gml:pos>418370.184 5715847.344</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_359dd4f5-0ef7-4f5a-b609-c8e803fe634b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_f0bc2902-4299-4039-97db-1e1ae81119c3"> - <gml:pos>418098.806 5715939.703</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_35bb656d-b631-4682-917b-b50086508b9e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3d0b18df-e882-4797-996c-24b10914b52d"> - <gml:pos>418508.812 5715919.606</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_375a2000-f10b-42eb-87cb-d000168a88f0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_aff3a13e-ef34-4337-b0c9-f710c88904c3"> - <gml:pos>418194.23 5715895.029</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_377cdfb8-dd9a-4881-9760-b0de52fbbdbf"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d1ccd49d-978f-47ab-a670-55161010989f"> - <gml:pos>418184.585 5715892.719</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_38af2111-33f2-4bda-b5e3-2100eef714a2"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e452a8b4-27b2-448f-8a2a-21f733dd74be"> - <gml:pos>418169.422 5715701.985</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_3ac5e89f-cad1-4b0b-ae79-78751da3538a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3e9ab8be-df45-43d3-af02-f4389d3a1965"> - <gml:pos>418161.069 5715704.817</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_3c0f883c-e3a1-4d59-959f-e955ea2f3247"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_69b8e73f-ede5-48c0-b6ba-1120b9e7a856"> - <gml:pos>418262.327 5715911.339</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_3e0a98f2-aa40-4fb6-a208-9d340b4e02eb"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_49a53b0f-0f61-49d6-a710-4fe43e5a2992"> - <gml:pos>418384.887 5715803.369</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_3f67cd8d-c1f4-4eb7-9e91-03c1a4ff3636"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_2d3319ce-b7b2-46ad-bfc3-03a688227749"> - <gml:pos>418125.523 5715715.521</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_3fcf3a0f-0e55-4dbc-b6da-83804d34fac3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_a8fb1c79-7a85-4052-95e5-f2f0b5b67f7e"> - <gml:pos>417986.368 5715949.401</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_3fd0410e-bb15-45ec-8b85-448c476a4aba"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d0938f19-a11d-4e69-bc69-a9d44458383b"> - <gml:pos>418368.677 5716018.548</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_423960c4-3287-4432-a123-ad3b13a5a63e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ccda964a-90c9-4394-bb74-61ff53ee8728"> - <gml:pos>418096.226 5715931.081</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_4240a722-10dd-4e12-a8b2-baafe6f9f05a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_6fe223e5-de3d-4f6e-bfe5-d4eb0eec8abc"> - <gml:pos>418272.1 5715913.666</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_42bc26e2-76a3-4677-b45a-25404fc9117a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_1da8aae4-8033-451a-b29a-e8aa3d78c064"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_0428a2fb-4d2c-4f8a-89c3-0a92d641caa4"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="6">418262.336 - 5715913.484 418284.134 5715918.687 418281.449 5715929.824 - 418277.42 5715946.54 418255.102 5715940.384 418262.336 - 5715913.484 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>3000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_4361be95-29a2-4348-961b-c9060a99d7b4"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_f830a9de-ad92-4fd9-95e0-43f1aa67dfa2"> - <gml:pos>418174.768 5715890.483</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_437dfcd8-8acc-4758-b97b-01a69ed0847c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_afc1ded7-cf7b-41d5-8e30-2b918b2e3ff6"> - <gml:pos>418402.618 5715793.053</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_438e2b50-46a8-4a72-b07c-bfc11d9bb441"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c166895b-24dd-432a-9e17-c9372f7ab914"> - <gml:pos>418277.038 5715955.003</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_440a0cb6-be5f-4887-9f07-80527a8c39a2"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_56e1f71a-b49a-4a81-b95e-4719637eed94"> - <gml:pos>418355.328 5716015.309</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_44d17c67-bfb3-4485-9851-ca3e47858327"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_1a0c5d37-11d4-450d-9d17-7528d3b7acca"> - <gml:pos>418306.226 5715922.595</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_459b94ec-6b40-43e3-b1f7-b5af1213c16f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_fd69512f-4015-4c86-9902-183319ce27d9"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_512d8e22-92ee-44bb-8d09-432050d8ba1c"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="25">417972.805 - 5715855.188 417968.636 5715853.612 417972.366 5715848.477 - 417976.724 5715845.312 417978.987 5715842.966 417981.042 - 5715840.899 417983.205 5715839.522 417986.555 5715838.824 - 417990.338 5715839.485 417993.451 5715840.15 417998.506 - 5715841.659 418002.639 5715843.343 418006.554 5715844.348 - 418007.184 5715845.112 418008.717 5715847.142 418009.141 - 5715849.089 418008.889 5715851.291 418007.951 5715853.579 - 418006.191 5715855.444 418003.744 5715856.972 418000.453 - 5715856.81 417997.855 5715852.972 417983.624 5715853.146 - 417983.443 5715855.224 417972.805 5715855.188 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_45b0ce1d-f165-4b5f-9103-a99f08bc14e7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ff362a67-0603-469d-be24-774f95b2e1d9"> - <gml:pos>417976.998 5715874.194</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_4736602a-d396-4b84-bffc-bbfbe502a557"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_97a0e541-c0f9-482c-b18f-9110f9b97a2e"> - <gml:pos>418172.313 5715719.118</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_48332228-b6b9-4a34-8d67-2a38f977252e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3c43348f-b31f-44ff-b2cf-86ce0ae12c42"> - <gml:pos>418481.569 5715929.813</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_485f606b-9ed3-4fd5-9929-6dede721dc38"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_2e9a8f66-8100-4363-b457-bf6acde46046"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_b384e26d-688f-4de2-b09d-a1c2bfd5fe4b"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="27">418031.378 - 5715853.914 418034.1 5715854.607 418030.052 5715867.071 - 418029.037 5715874.61 418035.417 5715876.486 418023.449 - 5715913.193 418041.609 5715924.4 418036.96 5715922.782 - 418001.213 5715910.293 418000.013 5715909.874 417999.507 - 5715907.857 417999.235 5715906.761 417996.444 5715895.096 - 417992.619 5715879.509 417984.551 5715878.596 417957.658 - 5715873.534 417960.41 5715869.434 418002.387 5715868.994 - 418006.61 5715868.311 418009.989 5715866.869 418013.705 - 5715864.495 418016.07 5715862.291 418018.349 5715859.495 - 418019.615 5715857.208 418020.542 5715854.836 418022.156 - 5715850.36 418031.378 5715853.914 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>3000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_490410d6-02c2-4e67-91a2-18ea2d9211ed"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e23c1bac-1207-41ee-8e71-f7e378fc028f"> - <gml:pos>418160.163 5715696.096</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_4a3cdc90-4da5-492e-8a63-01dd4a0133f7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0dc5c878-79ba-4777-92c3-5f06d3a5d4c5"> - <gml:pos>418266.595 5715920.821</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_4b725b51-c437-4935-a8a6-4fee598e4a48"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_630083cc-d6b6-4079-ba6f-b444214d7656"> - <gml:pos>418141.019 5715696.646</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_4c329170-c944-4a3b-813e-ccd70cfba0f8"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ced6d3bb-e388-4c32-96c7-ba1c379f768b"> - <gml:pos>418493.491 5715897.454</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_509ac533-bbbe-486d-b795-f6cb90275ea9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_cef63565-7b45-43af-a220-219cd39aab59"> - <gml:pos>418494.357 5715707.764</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_50de093f-54ec-4b7c-b572-6fe2a7f1bc1c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ecf81dd7-0ea7-4a37-ac3d-532a4b11b4ab"> - <gml:pos>418401.451 5715758.106</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_52730d09-297a-4c8e-bfd9-516107ab3283"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_b1247639-11a5-4763-b928-f214b0ee17cd"> - <gml:pos>418398.648 5715755.736</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_53f5ab66-4e2e-43e6-acb8-2ab012dba9d1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9be761c5-01f6-4024-9cc5-78a723c0cf30"> - <gml:pos>418038.553 5715898.577</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_55340158-5ffb-43be-ade3-97f841e26296"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_4c969753-1868-421e-99f6-e5f1e5142eea"> - <gml:pos>418146.988 5715697.03</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_55990c4f-23ea-46f5-a1bb-5ae86d37fea9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_719214e0-c513-479d-a620-d00a0fb97543"> - <gml:pos>418203.88 5715897.349</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_56e1c6e7-8d59-4d11-a378-ecbd48a7cb84"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3f5d2c71-73c8-4671-9d4b-288c17dcca48"> - <gml:pos>418078.008 5715913.29</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_58eb3f09-1d67-4673-a45a-255d7062efa4"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_1cedd020-bf1b-4416-8b47-4d05d84eaf58"> - <gml:pos>417997.958 5715886.011</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_5b3e0ef9-2979-4a6f-a207-c38198db953a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_7dbac211-69e8-4958-80bf-cc1e707fb1dd"> - <gml:pos>418491.627 5715929.093</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_5bb176a8-c7a3-4c72-8f37-1a329c27bee5"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_010f8457-5328-402c-b39d-44d5ef15997c"> - <gml:pos>418023.281 5715853.074</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_5d1bd0a4-714e-4d5b-bd61-16e5bbbdcefa"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_bc8463c4-eae8-4f29-b74c-de8e7a1de7bb"> - <gml:pos>418406.6 5715799.438</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_5fa6caac-1743-433b-9065-25a210410016"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_2b921757-da67-4c4b-a7ec-18635b4e5392"> - <gml:pos>418291.344 5715918.162</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_6027d8b0-cd14-4f3c-bead-0242910d254c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_7508c654-99ff-42fe-a512-41685fe9346a"> - <gml:pos>418192.071 5715927.474</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_603c75ea-4fbf-482a-9f87-2b9a288ffe1d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_b57aeed6-c17e-471a-ba7d-641c11add794"> - <gml:pos>418333.367 5715915.247</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_60b30a1c-33a0-4bc4-9a03-9b68a4cd77c1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_634a2a0b-2123-4f83-b462-dcf338c66b64"> - <gml:pos>418397.952 5715747.295</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_62cb5aee-ef7b-474d-974d-f6812c8164e0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_b5cc78c0-7d4f-4767-870d-d5f9687a41fd"> - <gml:pos>418380.161 5716004.738</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_67cbd473-9c19-4712-a661-80cd465154f7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_405bc665-5532-46ae-a417-7f6767568c64"> - <gml:pos>418185.054 5715708.441</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_688f9dee-b1b3-4888-9bd8-91ddf032aff0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_fdc467e9-6cc4-4edb-a226-c8ecb8f20e55"> - <gml:pos>418252.259 5715941.724</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_68d88e9c-174b-4004-963f-2378442fe60b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_fe288f06-be81-41f2-8a65-b12385f5e990"> - <gml:pos>418273.179 5715963.641</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_68eea76d-20a9-4dea-ba2c-ea95365bccac"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_12414d65-08ea-4499-9e6c-0e6b02fe8b52"> - <gml:pos>418101.859 5715933.561</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_6958e516-5a58-4277-92b2-d6f34e908ae8"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_a2c70714-e37c-445e-b818-e390a222f6a1"> - <gml:pos>418431.747 5715933.176</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_6aa141a2-c183-4bfc-87c1-f6f7bffb55da"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_aa0a647f-3b54-464c-ac97-00330727e43f"> - <gml:pos>418392.116 5715748.786</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_6b2048c8-f3c3-4f68-a624-b12748292bdd"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3da61b7a-6b75-4712-ac55-75910a47e903"> - <gml:pos>418007.422 5715816.752</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_6b27582f-5868-43f3-9faf-63e0617a180b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_18cd603e-7a87-4844-b851-eeafe566ba17"> - <gml:pos>418252.691 5715908.958</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_6b3375ba-d95a-4ede-8387-6067756fe176"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_cbcaaf1d-dbf1-48af-baf6-cc845640b8bd"> - <gml:pos>418477.423 5715917.736</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_6b909a3a-2c61-4980-8f7a-7d5774b93bda"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_4afd3f25-ca7c-480e-842a-d460f4c266e4"> - <gml:pos>418129.161 5715718.495</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_6d051170-29ea-4322-8fb3-1be5c69dd5b2"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3c0f5f9a-8b2f-4e75-a1f9-143cee3cb7de"> - <gml:pos>418181.008 5715731.217</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_6ebaaab0-fbbc-4b7b-8ab8-c36e753f4378"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_94bc7ac1-604d-4d58-867c-4fa7da11b01b"> - <gml:pos>418461.642 5715931.121</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_71ccf722-b097-42b8-8915-ac27b62fe3ee"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d02ef652-e0da-4fe0-9556-726cb63ae589"> - <gml:pos>418381.719 5715936.582</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_755b02af-c700-4cf2-99e7-d7c06ddcb6ba"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_aeae9ab0-3bb0-4ab4-b9bb-f890fd7ce62d"> - <gml:pos>418514.315 5715917.969</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_791e32d5-eec7-4827-a239-d21487f7e398"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_433ac770-eec1-44fb-9ff7-2b614be2a099"> - <gml:pos>417940.628 5715905.47</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_79dbb913-dfbd-48f2-858d-dafb6acee44b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_96672e2d-d12b-4485-ad7f-5131938ed282"> - <gml:pos>418460.554 5715881.844</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_7ab205db-a3b7-459c-b70c-a745480b4220"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0aa59b79-2ef1-474f-b210-2a9258e5c61d"> - <gml:pos>418405.941 5715748.13</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_7afeb10d-2ea0-4b4a-96cc-ca9d1676dcef"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ec5fc4f3-7f65-45dd-9ec4-770e35daa363"> - <gml:pos>418484.857 5715702.861</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_7b27ce6f-c972-434f-8264-ea1f52131dcb"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_95659141-1c6f-4449-ae15-fbacc6598fb6"> - <gml:pos>418364.855 5715938.078</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_7bf8034d-7e3d-44d8-8b68-88b585159664"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_824932ef-d788-496f-a9c2-cefd5254ee0a"> - <gml:pos>417996.356 5715751.558</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_7cbc8a89-b541-4d41-8e0e-28e27a44d496"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_aab88c54-406a-4210-868e-ddc156dc2b39"> - <gml:pos>418095.566 5715932.679</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_7ccf4e93-51c0-4478-8a60-4f9b9daf0a84"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_b09ff810-06fd-4c4b-a645-f7423c8714f7"> - <gml:pos>418176.457 5715709.342</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_7ff21520-72cf-457e-8d61-ad6807dce1ac"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_4b19b045-2d95-47a5-b635-3c547556ce6f"> - <gml:pos>418122.673 5715777.192</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_835ec818-6b81-49c3-a994-4a66b960fdbd"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_bb50034a-3507-480a-8da3-c9e4424e13fd"> - <gml:pos>418408.534 5715794.781</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_86e2767d-4ca6-45a2-89c2-0c30b23227f4"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d435fa79-a785-410f-b36f-74037546597d"> - <gml:pos>418320.506 5715925.22</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_87082b0e-601d-40b3-9495-e1944e098007"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_dc5e84fb-f161-4f15-a7b6-e6d3a93544c3"> - <gml:pos>418032.362 5715855.16</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_8b5d3361-66bb-4bf4-9444-d588f1e8f9db"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_8400d465-01a7-4ed8-9269-257d19a69531"> - <gml:pos>417985.078 5715751.068</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_8d78a76b-08d6-4435-9dd9-7e3b1a881e72"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_a7bf9200-5cc2-4b66-894f-d8e4506794cf"> - <gml:pos>418193.035 5715942.356</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_9114c88e-7a81-4c4a-aa70-0918793086d8"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_48512d1a-d3ea-4ded-b686-a0def0f54aee"> - <gml:pos>418169.436 5715716.299</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_9247e6b7-350c-4059-8b07-9873d6d97d56"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e6ce2e5e-e4eb-4ef3-bad0-6d7bbb62cfca"> - <gml:pos>418000.312 5715760.656</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_93e37b87-e3ca-49d8-955a-e323a4984274"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_33c6e5dd-21bc-40b4-92ed-540fac0151e9"> - <gml:pos>418408.103 5715791.639</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_9455f3d1-0f38-4d66-8e09-c13c95c3758f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_2151bfb4-2ac8-4b7a-a342-82790296f783"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_7ab28d80-bb70-4add-bc53-3badb46907ee"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="14">417974.749 - 5715812.843 417966.136 5715797.02 417965.68 5715796.354 - 417986.684 5715798.28 418008.123 5715800.245 417991.265 - 5715819.628 417989.583 5715821.329 417987.645 5715822.266 - 417986.042 5715822.609 417983.762 5715822.443 417982.155 - 5715822.106 417980.801 5715821.43 417979.783 5715820.497 - 417974.749 5715812.843 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>3000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_9484525d-3973-4ce2-abac-e0c506420680"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_8f171f34-c0f1-467b-a22f-940a7915dd84"> - <gml:pos>417936.367 5715913.309</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_99c488c9-053d-4923-8ab3-b07c8dd6a5c5"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_757a229c-fad2-4335-8c40-4f25e9179e12"> - <gml:pos>418373.597 5715803.859</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_9e8ecf6c-31dd-4653-92c6-778112186450"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_55025ba0-0d4b-49a0-bb1e-685ab9947602"> - <gml:pos>417964.238 5715872.117</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_a40d26a1-8893-4c82-b210-38b2750927d9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_49e757bf-bc1a-4a7f-8179-d41a6969845d"> - <gml:pos>418377.163 5715803.467</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_a428ad2d-00fa-419f-ad00-5d271efaf78a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d8117423-2ecf-4446-be59-a58ed302dd67"> - <gml:pos>417979.871 5715821.176</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_a83c1514-3b9a-4e49-b502-fcb0e7c9ffa3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d271b15d-0ff2-4ee2-a4a0-31488b0e8948"> - <gml:pos>418370.043 5715880.273</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_aae87c56-cf3a-463c-b69f-e24fff8d77bf"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c14ac14a-b14f-4b42-a46b-3e24ee890cdb"> - <gml:pos>418301.098 5715920.578</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_abf491e2-2901-4d6f-80f9-445c6813738d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_afc19be1-0a35-4b6c-812a-c9ce458272fd"> - <gml:pos>418409.926 5715787.474</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_ad3be022-ecf0-4e82-a837-f33e86b70946"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_56ea3964-5ce1-49d5-986a-37ec619bf269"> - <gml:pos>418495.355 5715919.836</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_af0a785d-3fb6-4159-8e18-bf3a7f717b82"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_86f275a0-3376-4fe0-a820-c3c9319aed90"> - <gml:pos>418402.466 5715802.51</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_af42aafe-9cf9-4d85-b0f6-02dc658e7a76"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_7e06375f-5561-461c-b5ed-7b9e6454de6e"> - <gml:pos>418401.881 5715935.31</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_af52620d-f6e5-4305-a9a0-d2c8c242f4e1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c925f8e5-6e7b-465b-8c74-ee595f970f3d"> - <gml:pos>418471.551 5715930.415</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_b25c7075-2375-4332-8a9d-f2f3ed5b8e8e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_76f30148-e7fd-4e51-a68c-69affa98f326"> - <gml:pos>418310.756 5715922.842</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_b2f1c863-0c9b-4f00-8aeb-7dbbbbdb5b03"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ee412960-babf-417c-959a-080f9830efee"> - <gml:pos>418421.834 5715933.971</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_b3bbcc81-5f42-4a2d-a690-0e76d52e1821"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_5255a019-fd0c-4cd7-9c4d-9d658a04be86"> - <gml:pos>418395.097 5715802.853</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_b62b9984-8832-434d-83b5-b8823ac4b5b3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_395e7c8d-f439-4030-8fc5-bcb30309a58c"> - <gml:pos>418349.805 5715932.127</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_b7d5ec2b-d63d-4a10-b41c-61679c5b758d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9e0b2f3d-23a1-40d8-ab7b-2446c4149ece"> - <gml:pos>418213.768 5715899.637</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_b8fd5b1e-3deb-47af-8b76-3754b36289ba"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_42f344b0-53e0-46b7-bbc1-7a186a915dda"> - <gml:pos>418480.054 5715918.841</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_b95bc0ee-8a72-4ddf-aa72-251ebedfb3d1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_f1c330f3-9463-4c43-88c7-fa3207cbeebb"> - <gml:pos>418035.145 5715900.968</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_bb964c1e-b7e6-4c53-9045-2619aa7afed3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_46b0ad13-a569-4b83-b086-156273f04318"> - <gml:pos>418139.585 5715699.06</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_bceeb912-0a80-413d-8aa0-f61bf891808b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_46402c4c-6084-4a60-9136-3f2d365d8a85"> - <gml:pos>417992.68 5715877.085</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_bd9763ce-38d8-499c-8767-d1ad0d44d01e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_b12adeda-579c-46d1-9040-e58c0dfcc40d"> - <gml:pos>418369.319 5715936.71</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_be49214b-b615-4c15-b481-9e2e1931c408"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_8608c743-9462-451d-a87b-4fd8ea782859"> - <gml:pos>418315.433 5716005.742</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_be7846b5-f38c-4c9f-99e8-12b735131808"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_a53352a9-6b1f-4010-be28-b81074bb61dd"> - <gml:pos>418125.122 5715716.328</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_befe2947-9ed6-4b77-9a3e-8ae5ccb48552"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_fa3ed6ac-43f6-4e12-8ad7-5406083b17a8"> - <gml:pos>418056.659 5715930.596</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_c0d2fdfa-07bf-470c-9bf7-2f84fe2ded51"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0ea6e7a4-fb84-410d-a878-461895176c6e"> - <gml:pos>418167.13 5715697.515</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_c2942af1-b1cd-4b82-8db6-ef40356faac8"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d3438689-9147-44fa-8670-d09cee42287d"> - <gml:pos>417963.404 5715868.853</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_c316056d-a198-471a-a1b0-db777bb29edc"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_fa8095eb-c0a5-46b3-80ec-70e29249c9c0"> - <gml:pos>418120.788 5715719.394</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_c36f18da-d134-460c-ac43-ad8c3fef7c13"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_12bbe0f7-a891-49c4-9bd0-9f6e697187f2"> - <gml:pos>418388.023 5715803.117</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_c3f2f8ef-4001-42ad-b457-f926d747eeb1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d309b4f7-2106-410b-b249-5847d191e60d"> - <gml:pos>418361.943 5715997.189</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_c4aa4abc-04c0-4247-b03d-de3292c73747"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_f98949e1-8cd9-4899-a997-b78aea9a5e0e"> - <gml:pos>417931.738 5715923.716</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_c514e3ac-36e3-48e0-ade5-deae4b3d8f72"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_65036e98-1fbb-4839-b685-7d29f3ee9b80"> - <gml:pos>418353.17 5716009.729</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_c9da0389-680a-48d8-8287-dc50277e251a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_a98b77ce-5a61-498b-a022-3b50d522fa5b"> - <gml:pos>418410.576 5715778.549</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_cc7598e6-b304-4171-a2f2-c0110d523bd3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_f9deab71-914f-4726-80fa-62a45292f66e"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_cde45001-e7a9-4dfc-9673-1ffd591f8801"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="14">417992.271 - 5715961.587 417965.833 5715945.116 417931.624 5715923.804 - 417937.483 5715912.729 417938.213 5715911.35 417943.614 - 5715901.138 417957.825 5715911.002 417987.939 5715921.538 - 418032.022 5715936.939 418052.049 5715943.912 418000.967 - 5715947.241 418000.433 5715948.123 418001.253 5715967.183 - 417992.271 5715961.587 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>3000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_ccc4f068-4150-4779-a2e3-39a5e7185fcc"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_72086cbe-3f56-481e-ad75-fe8b1240f309"> - <gml:pos>418100.515 5715932.952</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_cce57717-2641-4757-a45c-828a90fddd22"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e4399473-8606-4d99-9741-572095a5d2aa"> - <gml:pos>418018.553 5715752.916</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_ccf9831e-4643-404a-809a-9932ef3c8ea8"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_72432444-9578-43b9-bff2-e2f2dcc73ca1"> - <gml:pos>418116.529 5715928.639</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_cd972b03-43e6-4e1c-8f02-91382e0d9141"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_5f6fba5a-1d30-4aa7-b7ef-6a3b0bd6aebb"> - <gml:pos>418116.208 5715946.219</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_ce6704d9-fce6-40b3-86e0-a91cb47c6ba6"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_33fa7d16-29ff-4f74-9f7d-3088703a81da"> - <gml:pos>418040.704 5715923.959</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_ceac03f0-cde5-482f-9045-593147f3cf5b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_fda7623e-f7ff-42ec-b3f3-a0ecc7a05f22"> - <gml:pos>418170.393 5715712.363</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_d0045421-8b78-4e91-9765-784761d6932e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3f516029-bd65-4f01-81f7-a6981b0362aa"> - <gml:pos>418126.135 5715719.836</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_d0662e2a-ef98-4b08-b552-ed06bc6f2418"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_483e46ab-07b5-4030-93be-b6c5994fb6aa"> - <gml:pos>418095.53 5715935.107</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_d2081509-c7ff-4f67-bf85-376854ee356f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_86ed2a7b-0243-4ce9-96da-2b68db62d4ad"> - <gml:pos>418154.306 5715690.755</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_d3f77899-698c-4530-9bf0-9446c4e97950"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_716ec8a7-fa0b-4060-8201-afa7540b6be2"> - <gml:pos>418359.627 5715934.369</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_d78d0f47-8f70-4db7-b567-ca53436028a0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_7c5996ad-809a-46ab-9887-fd8155604a00"> - <gml:pos>417960.347 5715874.712</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_d9d651cd-9e68-41c3-87be-860491bfdf36"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_52bd24b4-60b8-4c28-91e3-9c52a8da4e95"> - <gml:pos>418291.036 5715877.726</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_dc61f364-f67c-4e0f-846c-fb8da12644fe"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ec2c246e-c503-4fc9-bb47-c4940fbd2ead"> - <gml:pos>418279.388 5715854.865</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_df8d144e-8a81-46e9-91a1-9e772d06cd97"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_44705f49-66d3-4a42-9dc3-a55420ada94e"> - <gml:pos>418496.353 5715919.186</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_dfae2e63-d763-4b25-a033-63268f76f5f9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_408bd86a-4a3a-4f95-9aba-03bdc1062a4b"> - <gml:pos>418404.778 5715765.834</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_dfcbc49d-2a08-44b2-ab4b-e1b3b674895a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_2eb9edda-b25c-472a-aa1b-d7be8d707ad4"> - <gml:pos>418233.176 5715904.39</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_e1ff0c10-daf0-4e75-b6a3-a943fb3b485e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_db228582-423d-44ee-9b3a-18ae18b92a16"> - <gml:pos>418155.188 5715885.821</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_e5525d24-4d77-4448-858f-b3571e386c3b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_16b66d6e-b97b-4f91-a3fe-f73cc493ff0a"> - <gml:pos>418411.791 5715934.636</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_e5c52029-ebff-427c-8317-3fe51fc9b976"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_f4836745-dfdd-4ab8-aa4c-6b1c5327a1c7"> - <gml:pos>418088.791 5715911.953</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_e664d7ed-55a0-4bbe-806b-3e022ce8fe32"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_eb76d437-0316-4778-b06b-21aa019e690a"> - <gml:pos>418272.874 5715966.956</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_e7f10651-4e42-414f-bdb5-de83d4bc97a3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_f630664f-36ed-4e74-bfa8-90cc22b69b1c"> - <gml:pos>418411.33 5715784.127</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_ea46d8a3-a8db-42e0-a7c4-7c2fa857d24d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_884174f1-4e64-4007-851f-a7052d8a6817"> - <gml:pos>418389.476 5715738.972</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_eae22aa8-e056-4616-8aaa-bf4bad0ef763"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_4d619f40-3087-4b34-9f32-ec662fafa87d"> - <gml:pos>418023.671 5715753.715</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_eae9cff7-e604-4c96-8807-eb8f0973c5d0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_27b46d7b-7af4-4be7-9faa-7edb6a6449a8"> - <gml:pos>418305.632 5715877.703</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_eb3d2ecc-842b-422b-9541-4abf52836d08"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_345a8f8f-89d8-448a-8a94-5b784d94456e"> - <gml:pos>418028.091 5715907.796</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_eb807173-aebd-46be-b685-fa3643324fb0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d6b2432f-6fd1-43c0-ae4d-505ea21bb915"> - <gml:pos>418405.887 5715802.518</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_ec3f6734-0402-4a91-a4f3-539d02f3cf65"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9b6a1997-1f9b-49f2-8218-3b7d21483e1e"> - <gml:pos>418159.418 5715696.611</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_ecec985b-9d6e-408d-a9f9-3d25e55ffdf3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_5bd4a78d-2f66-4533-a7d0-1a0d6e0b4d38"> - <gml:pos>418357.271 5715967.3</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_eed516a0-9661-41d8-b4e1-672cf1b5c76b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_09fa42d5-f40c-4ac3-9d54-a8e9936ddbd8"> - <gml:pos>418223.361 5715902.01</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f0b1cbcc-50a7-4f51-9cd2-5843fca532c2"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_722de9b0-3548-4de8-bb6d-87e9890a039f"> - <gml:pos>418038.075 5715921.289</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f0b69e9d-fb07-4a58-9865-0427469c15f0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_84a64fee-948d-4700-8187-21525f0a5075"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_c7d6766b-4cc5-4628-a1a2-858c050b5180"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="9">418085.051 - 5715897.931 418132.488 5715910.538 418120.597 5715934.166 - 418112.984 5715949.461 418087.224 5715940.284 418084.29 - 5715939.262 418089.053 5715924.594 418081.186 5715913.495 - 418085.051 5715897.931 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>3000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f0bdf994-6a8a-465b-b2cf-0cd258e6d730"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_27ef7a49-5b6a-49ee-9788-0fc57f87d1c7"> - <gml:pos>418167.508 5715713.595</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f0be0a24-5afa-428c-9bf2-16f1f292d8c1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_2e502b66-8d63-4f3a-945c-cdb5d4f25989"> - <gml:pos>417969.441 5715873.847</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f47f7930-5406-43fd-8f1d-ca857e34e760"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_f8667709-a50b-4795-b119-0625d2130f5f"> - <gml:pos>418371.559 5716017.624</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f5a54a01-648b-4ace-841d-afefb59fe95f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c1de58f0-aaf7-4e7e-a9a5-2c4a3a01c900"> - <gml:pos>418451.706 5715931.786</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f6e099d2-269d-4601-9181-0976b5fb6f66"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_50118c83-cddb-4033-95f0-68ad2c4dea85"> - <gml:pos>418381.2 5715803.365</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f73b7fd1-2de1-4cf8-aa4f-b4065c00e890"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_cf7d6b0d-d69d-4955-95e6-0dbb60df0a99"> - <gml:pos>418135.037 5715705.565</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f7919e11-2fbb-48cd-81ee-ec998ae00aaa"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_83da203e-7843-4110-8546-800b3d1742ec"> - <gml:pos>418036.964 5715887.851</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f7b8d361-8b30-42a8-b2f6-7b9edab17d1d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_296621b4-a1b8-4741-8dc9-1a3eb465a638"> - <gml:pos>418102.314 5715942.002</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f7cb6654-c07c-43a7-a640-c3434627974f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_b756f553-7f28-4333-a8fc-48ce81c200b7"> - <gml:pos>417984.997 5715944.18</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>2000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f842da25-a537-4ed9-a7e8-13372cdf5a2f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0f8a956b-08d6-4d9e-a618-5c42dc868780"> - <gml:pos>418059.012 5715888.642</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_f9fa5016-c335-47a6-9ea9-7cb697767bd1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0da11879-3cd2-49b3-9ab2-1685d7bfd22c"> - <gml:pos>418115.754 5715920.209</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_fdb5fd05-f173-4b46-a549-471d80bd61e7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_54adcfe1-eafc-490b-9875-a2cf4f514c07"> - <gml:pos>418007.008 5715752.191</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_AnpflanzungBindungErhaltung - gml:id="FEATURE_feb42b64-6c4f-4b5c-bee4-ee3cbc389bd0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ef3fc13e-553b-47a4-ac55-2f272b48642d"> - <gml:pos>418167.503 5715701.538</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:massnahme>1000</xplan:massnahme> - <xplan:gegenstand>1000</xplan:gegenstand> - </xplan:BP_AnpflanzungBindungErhaltung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_06c6bfd7-2a79-4e6e-8ed9-685f5adcb7ee"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_9d731774-0dbe-4cfa-8995-13f0a55df300"> - <gml:posList srsDimension="2" count="4">418415.467 - 5715722.816 418400.657 5715720.475 418396.729 5715745.327 - 418411.539 5715747.667 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_13427f95-88a6-492d-a094-452ebaea2c71"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_b5275171-133e-4d68-b56a-fcbfadd6d893"> - <gml:posList srsDimension="2" count="16">418051.75 - 5715848.23 418101.853 5715860.346 418127.085 5715866.352 - 418148.521 5715871.426 418153.509 5715872.623 418172.812 - 5715877.247 418190.326 5715881.489 418211.211 5715886.388 - 418231.948 5715891.275 418259.145 5715897.813 418287.383 - 5715904.527 418313.035 5715910.537 418335.275 5715915.718 - 418338.933 5715916.576 418359.375 5715921.354 418381.058 - 5715922.639 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_1418749e-715d-4f00-add5-02f04d0d66ac"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_2ef2a7f7-73cd-4ed3-b30a-b7ed0bf3e4f9"> - <gml:posList srsDimension="2" count="4">418105.344 - 5715736.379 418074.558 5715757.175 418084.29 5715773.12 418115.825 - 5715779.5 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_14d10e01-6ae1-45dd-b101-f0115b409043"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_aabe5660-523d-4bea-b501-e9eec8af334b"> - <gml:posList srsDimension="2" count="8">418139.76 - 5715902.757 418164.706 5715908.752 418173.771 5715910.932 - 418203.38 5715917.956 418219.55 5715921.819 418229.038 5715924.072 - 418254.742 5715930.174 418258.638 5715915.688 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_1d2d7d28-99b0-41ad-b7df-2438a70d9de3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_827dff26-0476-4b3e-b8f2-8db9676547c2"> - <gml:posList srsDimension="2" count="3">418010.039 - 5715779.341 417970 5715775.454 417968.46 5715790.369 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_1f85d8c9-ea29-40f3-8d88-9080bf6e44b9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_3ffc1383-fadc-4113-87f4-9cd09520da31"> - <gml:posList srsDimension="2" count="8">418258.638 - 5715915.688 418232.501 5715909.484 418223.024 5715907.233 - 418206.852 5715903.369 418177.253 5715896.348 418168.21 - 5715894.174 418146.646 5715888.991 418139.76 5715902.757 - </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_244e89d4-2858-4941-ae49-3df73fd1c179"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_42af18d9-1d58-4e3d-aec6-c99628fc0254"> - <gml:posList srsDimension="2" count="3">417978.909 - 5715887.459 417958.601 5715877.336 417952.693 5715889.188 - </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_3adf4f15-28eb-4479-8b95-5fd915a20e3b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_4382e6f0-8081-4472-b719-27c443978676"> - <gml:posList srsDimension="2" count="4">418004.387 - 5715832.311 418022.485 5715839.054 418027.639 5715824.992 - 418010.814 5715818.831 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_3f4148dd-ec1f-41cd-bf97-95ceec6246ea"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_1a3f9f9d-7418-4f59-abd3-6c27f12792e9"> - <gml:posList srsDimension="2" count="23">418381.058 - 5715922.639 418384.967 5715907.851 418361.541 5715906.462 - 418342.352 5715901.977 418338.689 5715901.117 418316.446 - 5715895.937 418290.827 5715889.933 418262.631 5715883.23 418235.42 - 5715876.689 418214.643 5715871.792 418193.803 5715866.903 - 418176.324 5715862.67 418157.004 5715858.042 418152.017 - 5715856.846 418149.16 5715856.161 418149.467 5715854.88 418143.309 - 5715853.394 418139.38 5715852.446 418139.052 5715853.787 - 418130.557 5715851.765 418105.351 5715845.765 418055.274 - 5715833.656 418051.75 5715848.23 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_422e3e27-5c64-4172-9648-579dcc956ef5"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_be1222dd-c4d8-4ab7-9b74-9cf317ba8172"> - <gml:posList srsDimension="2" count="3">418372.239 - 5715864.876 418376.362 5715849.423 418356.978 5715844.25 - </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_4cabaf5e-3a10-4272-ae8b-5117efc65ba1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_abf348f1-6e82-4996-b154-d8a47687519b"> - <gml:posList srsDimension="2" count="5">418058.02 - 5715925.94 418059.446 5715926.404 418066.946 5715903.344 - 418052.687 5715898.706 418045.187 5715921.766 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_4efea97d-3719-4172-b93e-dfa4bdd268e1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_c8aa73cc-d891-4a75-b21c-d0777d990e8a"> - <gml:posList srsDimension="2" count="4">418045.187 - 5715921.766 418058.02 5715925.94 418059.446 5715926.404 418066.946 - 5715903.344 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_51be1969-5bb3-434e-ac3e-8c295831901e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_c0646183-0127-4cb9-a925-01831706afa0"> - <gml:posList srsDimension="2" count="3">417963.591 - 5715761.143 417964.171 5715750.323 417948.45 5715749.36 - </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_56078ddf-aa75-464d-9f5c-2b25f2e1b2f9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_1b4a4a14-28db-49e2-8b1e-249278b54785"> - <gml:posList srsDimension="2" count="3">418096.492 - 5715890.947 418115.141 5715895.704 418118.847 5715881.176 - </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_5d2fcf6c-be80-4c2e-a27d-4f561f2e6e03"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_ce2975b2-0c08-4153-8c37-4ad3df897904"> - <gml:posList srsDimension="2" count="10">418115.825 - 5715779.5 418117.217 5715773.122 418120.424 5715770.214 418126.32 - 5715774.26 418134.12 5715762.102 418136.004 5715763.049 418144.291 - 5715750.073 418135.651 5715744.747 418129.71 5715754.156 - 418105.344 5715736.379 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_65d62881-955c-4e14-a2d8-5fdc75d5a045"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_ebc280ea-541c-4aa6-8fca-424386322a2f"> - <gml:posList srsDimension="2" count="5">418282.87 - 5715936.884 418303.706 5715941.862 418326.325 5715947.228 - 418344.804 5715951.611 418348.265 5715937.022 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_7c1baf08-753b-4f7c-9c4f-b50b193f8552"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_81453d8e-b5e9-4eb8-8077-51868339fbd5"> - <gml:posList srsDimension="2" count="3">418066.946 - 5715903.344 418052.687 5715898.706 418045.187 5715921.766 - </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_87d3546b-e4a8-4acf-8acf-cfecfbd766df"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_11dffa26-36bd-426e-b41c-225f999b8613"> - <gml:posList srsDimension="2" count="7">418040.336 - 5715871.636 418049.792 5715876.742 418051.185 5715877.431 - 418059.625 5715881.618 418061.595 5715882.597 418071.404 - 5715884.941 418075.827 5715868.082 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_9ca96ef1-5861-46be-a6bd-5f3d8e76c539"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_feb2a64f-2ebf-4661-b90b-3b38c0be9802"> - <gml:posList srsDimension="2" count="4">417952.693 - 5715889.188 417964.701 5715897.522 417972.528 5715900.26 - 417978.909 5715887.459 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_9cac047c-c94d-4f3e-9d2c-01b98bc51a86"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_b65d84de-dc55-4127-8cd5-54f54d31c497"> - <gml:posList srsDimension="2" count="5">418348.265 - 5715937.022 418329.786 5715932.639 418307.178 5715927.275 - 418286.354 5715922.301 418282.87 5715936.884 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_a814dd49-e7c6-4518-bdb8-206a148150ab"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_8cd6310d-7504-4230-84d7-0f8fe5c423d4"> - <gml:posList srsDimension="2" count="4">418010.814 - 5715818.831 418006.744 5715822.839 418004.743 5715830.88 - 418004.387 5715832.311 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_ad40fa85-9105-433a-9ec5-5efef031c7a4"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_bc281c81-4eba-4f0c-8be9-4e167f4b6a2b"> - <gml:posList srsDimension="2" count="6">418075.827 - 5715868.082 418044.284 5715859.805 418043.69 5715862.07 418039.981 - 5715867.826 418041.271 5715868.804 418040.336 5715871.636 - </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_b8aa123d-4266-4447-ab0c-f5c5200e5cc7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_91ab6d39-6699-479c-a98a-a9720545d3c9"> - <gml:posList srsDimension="2" count="5">418373.362 - 5715956.7 418387.863 5715955.764 418406.817 5715954.542 418423.293 - 5715953.48 418422.329 5715938.517 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_cd911270-eb86-44bb-a64b-8232a8637d57"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_328c5ce2-7c93-4349-97eb-b03558244a2e"> - <gml:posList srsDimension="2" count="5">418422.329 - 5715938.517 418405.852 5715939.579 418386.897 5715940.802 - 418372.397 5715941.737 418373.362 5715956.7 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_cf004391-d241-4f80-bec9-10982fceae1e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_1efadaa2-0a96-47d7-ba1e-971ad09c5eb2"> - <gml:posList srsDimension="2" count="2">418411.539 - 5715747.667 418415.467 5715722.816 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_d4b2457d-b7d0-4ea0-b188-97dfc8458cc2"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_eefe13d0-2ee7-4f81-ad15-e438eb7112db"> - <gml:posList srsDimension="2" count="9">418386.151 - 5715922.941 418400.273 5715923.779 418422.13 5715922.161 - 418421.946 5715919.679 418427.417 5715919.313 418444.448 - 5715918.17 418484.154 5715915.556 418505.38 5715914.176 418504.408 - 5715899.214 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_d5217f8d-a4d0-4bc7-8087-0990106a747e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_2fa3adc9-390f-4618-9dd6-14bd2116a30f"> - <gml:posList srsDimension="2" count="3">417968.46 - 5715790.369 418008.67 5715794.272 418010.039 5715779.341 - </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_d7918786-60d8-4cae-a32c-84bc5a2a6293"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_61f44c6e-d0c3-48b3-9199-dde62d01e39d"> - <gml:posList srsDimension="2" count="3">418118.847 - 5715881.176 418100.199 5715876.418 418096.492 5715890.947 - </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_da4a0948-6a84-472b-9954-aa7d17464dce"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_d5ef2910-45ac-43b6-a224-15f4074be978"> - <gml:posList srsDimension="2" count="11">418504.408 - 5715899.214 418483.175 5715900.594 418443.454 5715903.209 - 418426.414 5715904.353 418420.945 5715904.719 418411.495 - 5715905.351 418411.718 5715908.46 418401.651 5715909.147 - 418397.975 5715909.398 418390.025 5715908.286 418386.151 - 5715922.941 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_f88440bc-7e64-4340-91c8-56c26143a4c9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_37802856-e49b-4346-ae89-97b7760f25b8"> - <gml:posList srsDimension="2" count="3">417948.45 - 5715749.36 417947.87 5715760.18 417963.591 5715761.143 - </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BauGrenze gml:id="FEATURE_f8925e8f-9c47-4dd5-adb8-328b10d40792"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_7fc43353-ffb7-42c7-ac47-6be0be8e20d6"> - <gml:posList srsDimension="2" count="4">418372.239 - 5715864.876 418353.09 5715859.766 418355.941 5715848.133 - 418356.978 5715844.25 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_BauGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BaugebietsTeilFlaeche - gml:id="FEATURE_059c7335-42f9-4675-9328-93408ee0e134"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_f714a44b-7728-44d9-83d2-8d2c57a5d038"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_f0e27410-6688-421f-b9da-852003d1a21e"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="18">417932.234 - 5715746.146 417928.549 5715739.499 417955.467 5715742.959 - 417955.802 5715748.144 417982.794 5715750.487 418025.026 - 5715754.16 418023.457 5715762.607 418021.972 5715770.617 - 418018.864 5715787.393 418008.123 5715800.245 417986.684 - 5715798.28 417965.68 5715796.354 417958.158 5715785.776 - 417948.416 5715770.41 417943.873 5715764.124 417942.604 - 5715762.362 417936.56 5715752.908 417932.234 5715746.146 - </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:GFZ>0.45</xplan:GFZ> - <xplan:GRZ>0.3</xplan:GRZ> - <xplan:Z>1</xplan:Z> - <xplan:besondereArtDerBaulNutzung>1200</xplan:besondereArtDerBaulNutzung> - <xplan:bauweise>1000</xplan:bauweise> - <xplan:bebauungsArt>1000</xplan:bebauungsArt> - </xplan:BP_BaugebietsTeilFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BaugebietsTeilFlaeche - gml:id="FEATURE_36c557f3-9e16-46a1-8695-4cac4968c98a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_016078cf-8975-4873-8aca-4f79dd2dc023"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_fb6fdb64-3f19-4b8d-a915-2f389dc11959"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="24">418233.194 - 5715906.566 418262.336 5715913.484 418255.102 5715940.384 - 418239.083 5715935.941 418227.602 5715932.757 418217.606 - 5715929.984 418212.915 5715949.867 418195.053 5715945.107 - 418167.411 5715937.74 418164.124 5715951.571 418120.597 - 5715934.166 418132.488 5715910.538 418085.051 5715897.931 - 418036.566 5715872.962 418037.489 5715870.098 418041.793 - 5715856.568 418099.168 5715871.623 418146.378 5715882.834 - 418145.03 5715885.518 418168.911 5715891.258 418177.95 - 5715893.431 418207.547 5715900.452 418223.719 5715904.316 - 418233.194 5715906.566 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:GFZ>0.45</xplan:GFZ> - <xplan:GRZ>0.3</xplan:GRZ> - <xplan:Z>1</xplan:Z> - <xplan:besondereArtDerBaulNutzung>1200</xplan:besondereArtDerBaulNutzung> - <xplan:bauweise>1000</xplan:bauweise> - <xplan:bebauungsArt>1000</xplan:bebauungsArt> - </xplan:BP_BaugebietsTeilFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BaugebietsTeilFlaeche - gml:id="FEATURE_44c1d85d-d696-4946-9868-7c5181e9d644"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_31c50226-a7c7-4d6e-87ff-462012c85c5d"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_e70a6b30-37a0-4e67-aa40-a6430262b86f"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="11">418041.609 - 5715924.4 418023.449 5715913.193 418035.417 5715876.486 - 418036.566 5715872.962 418085.051 5715897.931 418081.186 - 5715913.495 418089.053 5715924.594 418084.29 5715939.262 - 418081.185 5715948.824 418071.203 5715942.664 418041.609 - 5715924.4 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:GFZ>0.3</xplan:GFZ> - <xplan:GRZ>0.2</xplan:GRZ> - <xplan:Z>1</xplan:Z> - <xplan:besondereArtDerBaulNutzung>1200</xplan:besondereArtDerBaulNutzung> - <xplan:bauweise>1000</xplan:bauweise> - <xplan:bebauungsArt>1000</xplan:bebauungsArt> - </xplan:BP_BaugebietsTeilFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BaugebietsTeilFlaeche - gml:id="FEATURE_57a3354c-bf84-4f39-be61-e582853f73ea"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_d4d65438-bf9b-4139-9102-7cb99453d79a"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_9d6b4bd9-36ea-4ad2-9839-e09a9bf601a1"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="10">418051.184 - 5715773.327 418066.113 5715776.541 418057.084 5715811.512 - 418047.038 5715850.181 418035.952 5715847.271 417998.327 - 5715833.253 417996.657 5715826.888 418000.502 5715822.288 - 418008.621 5715813.543 418051.184 5715773.327 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:GFZ>0.3</xplan:GFZ> - <xplan:GRZ>0.2</xplan:GRZ> - <xplan:Z>1</xplan:Z> - <xplan:besondereArtDerBaulNutzung>1200</xplan:besondereArtDerBaulNutzung> - <xplan:bauweise>1000</xplan:bauweise> - <xplan:bebauungsArt>1000</xplan:bebauungsArt> - </xplan:BP_BaugebietsTeilFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BaugebietsTeilFlaeche - gml:id="FEATURE_854cf049-c53e-4f64-8fe0-85be0422dd4a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_a87839da-f31e-4e55-892e-bb36ff07b3b5"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_9a2faceb-3633-42e8-914f-12199fe95234"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="5">418407.803 - 5715804.366 418361.553 5715806.515 418384.129 5715709.723 - 418440.047 5715720.93 418407.803 5715804.366 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:GFZ>0.3</xplan:GFZ> - <xplan:GRZ>0.2</xplan:GRZ> - <xplan:Z>1</xplan:Z> - <xplan:besondereArtDerBaulNutzung>1200</xplan:besondereArtDerBaulNutzung> - <xplan:bauweise>1000</xplan:bauweise> - <xplan:bebauungsArt>1000</xplan:bebauungsArt> - </xplan:BP_BaugebietsTeilFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BaugebietsTeilFlaeche - gml:id="FEATURE_8b62af3d-f63b-47e2-b93e-687191b54e97"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_e9ba3145-3c33-4874-bee5-76bbd64f2b43"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_65eeb487-0219-42c1-9946-9d2851757ab5"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="24">418357.389 - 5715966.799 418345.265 5715965.443 418343.534 5715964.944 - 418341.422 5715964.336 418328.931 5715960.733 418318.296 - 5715998.142 418306.819 5715995.165 418291.062 5715991.077 - 418293.774 5715980.457 418295.592 5715973.344 418272.221 - 5715968.133 418277.42 5715946.54 418281.449 5715929.824 - 418284.134 5715918.687 418307.873 5715924.358 418330.478 - 5715929.721 418353.82 5715935.258 418369.307 5715938.932 - 418386.704 5715937.809 418405.659 5715936.586 418434.923 - 5715934.7 418436.736 5715962.632 418362.784 5715967.402 - 418357.389 5715966.799 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:GFZ>0.45</xplan:GFZ> - <xplan:GRZ>0.3</xplan:GRZ> - <xplan:Z>1</xplan:Z> - <xplan:besondereArtDerBaulNutzung>1200</xplan:besondereArtDerBaulNutzung> - <xplan:bauweise>1000</xplan:bauweise> - <xplan:bebauungsArt>1000</xplan:bebauungsArt> - </xplan:BP_BaugebietsTeilFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BaugebietsTeilFlaeche - gml:id="FEATURE_b2e7245a-222b-427a-9c57-bb0918b96756"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_caea0fe5-5ba8-4489-8bb1-62426516ca91"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_50b2e67d-dd4c-4b7b-96c4-bd182d72e8cd"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="54">418355.941 - 5715848.133 418356.978 5715844.25 418364.584 5715813.894 - 418387.046 5715812.855 418389.134 5715812.759 418411.41 - 5715811.725 418414.567 5715811.579 418442.161 5715818.749 - 418427.153 5715872.225 418426.509 5715874.521 418492.745 - 5715891.277 418493.482 5715888.664 418506.873 5715888.101 - 418508.013 5715898.578 418523.944 5715898.385 418523.778 - 5715913.592 418523.75 5715916.193 418522.52 5715918.071 - 418516.833 5715918.441 418484.48 5715920.543 418444.78 - 5715923.157 418408.295 5715925.602 418383.997 5715927.181 - 418380.843 5715927.364 418370.165 5715927.982 418358.465 - 5715925.247 418338.021 5715920.469 418334.365 5715919.611 - 418312.125 5715914.431 418286.464 5715908.418 418258.215 - 5715901.702 418231.022 5715895.165 418210.296 5715890.28 - 418189.399 5715885.378 418171.876 5715881.134 418152.577 - 5715876.511 418147.594 5715875.316 418126.161 5715870.242 - 418100.888 5715864.226 418076.084 5715857.789 418047.038 - 5715850.181 418057.084 5715811.512 418066.113 5715776.541 - 418095.703 5715782.891 418119.974 5715788.13 418110.407 - 5715826.26 418107.058 5715839.617 418131.895 5715845.475 - 418135.479 5715829.995 418136.707 5715824.698 418324.171 - 5715864.492 418350.514 5715870.045 418353.09 5715859.766 - 418355.941 5715848.133 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:GFZ>0.45</xplan:GFZ> - <xplan:GRZ>0.3</xplan:GRZ> - <xplan:Z>1</xplan:Z> - <xplan:besondereArtDerBaulNutzung>1200</xplan:besondereArtDerBaulNutzung> - <xplan:bauweise>1000</xplan:bauweise> - <xplan:bebauungsArt>1000</xplan:bebauungsArt> - </xplan:BP_BaugebietsTeilFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BaugebietsTeilFlaeche - gml:id="FEATURE_c7281ccb-0e80-45dd-b922-35fafa44365d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_e1c5a633-9f97-4856-bcf2-5c4e11af5107"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_1bbfbb06-df03-4e98-b55b-1b36ad5dd94b"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="11">417950.565 - 5715887.711 417957.658 5715873.534 417984.551 5715878.596 - 417992.619 5715879.509 417996.444 5715895.096 417999.235 - 5715906.761 417999.507 5715907.857 418000.013 5715909.874 - 418001.399 5715915.393 417947.953 5715892.932 417950.565 - 5715887.711 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:GFZ>0.45</xplan:GFZ> - <xplan:GRZ>0.3</xplan:GRZ> - <xplan:Z>1</xplan:Z> - <xplan:besondereArtDerBaulNutzung>1200</xplan:besondereArtDerBaulNutzung> - <xplan:bauweise>1000</xplan:bauweise> - <xplan:bebauungsArt>1000</xplan:bebauungsArt> - </xplan:BP_BaugebietsTeilFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_BaugebietsTeilFlaeche - gml:id="FEATURE_e0ec3321-7a60-4acf-afc6-7012adce444d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_9c4283be-208b-43d8-b4f7-fe15cb02119c"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_fa291379-8719-467d-9555-ebac792404bd"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="15">418063.837 - 5715761.788 418064.177 5715760.796 418077.98 5715749.572 - 418084.362 5715745.492 418112.546 5715723.69 418127.141 - 5715712.402 418134.066 5715702.197 418145.135 5715685.478 - 418194.463 5715710.782 418155.678 5715780.293 418151.761 - 5715787.185 418151.714 5715787.268 418064.499 5715769.676 - 418062.152 5715766.704 418063.837 5715761.788 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:GFZ>0.45</xplan:GFZ> - <xplan:GRZ>0.3</xplan:GRZ> - <xplan:Z>1</xplan:Z> - <xplan:besondereArtDerBaulNutzung>1200</xplan:besondereArtDerBaulNutzung> - <xplan:bauweise>1000</xplan:bauweise> - <xplan:bebauungsArt>1000</xplan:bebauungsArt> - </xplan:BP_BaugebietsTeilFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_Bereich gml:id="FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:nummer>0</xplan:nummer> - <xplan:name>defaultBereich</xplan:name> - <xplan:nachrichtlich xlink:href="#FEATURE_0e35b6c0-51d8-4d55-a5e3-9a5297e48e5b" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_065b3791-19fb-4d74-87b1-d7243366b09f" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_eef4c02e-8719-49fd-b97b-c30811a6cc38" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_308fc525-15f5-406f-a686-12e100a9f598" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7a1ed9d2-fb82-4848-8dad-6b2dd5d9c464" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_be129262-4134-4367-9499-73b9fdca6a1f" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7a2daf54-2262-44a7-9653-9ae7239a8b30" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_434b3ef8-ea33-4bd9-8ede-6e56faa013a7" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_5bdbd361-1ff0-4fd6-8cd4-b0c7f7a70805" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_11608f51-01e5-4363-af56-d1ac18286e03" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_a24085ef-6328-43e0-a4cd-ad7eb4ced375" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_edc32c31-877a-450a-a348-aadace42329e" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7e649e23-7cbc-4816-be40-c741ba626450" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_8254c274-a4fd-4f20-a225-d0f7680b590d" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7af7d583-98e7-488b-b3d4-516a9b54204d" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_100be47d-8b1f-46f4-9c41-951e0321a8d5" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_8c6c8b49-3f8a-4e26-ab93-6913c729da29" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_36e864ce-2f43-415d-9560-4f909df42bcc" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_65949f10-2e96-45fe-a0f4-87f6c7a8f370" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_a33824d3-cefb-4ff1-96dc-6d9b66248111" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_8a452d37-6f65-4bcc-9290-646169d912a6" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_b5eed084-c2a1-4d64-ae24-ee95f5a8d402" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_a5046ad3-693d-4ae4-8056-a049d1b2c41f" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_fcf8b86a-fbb1-4953-bfac-e2016f604a1e" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_0751ebea-8fc3-4aba-a14a-591551f466ca" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_b6c7e552-be49-49aa-8fcc-d20b6a3b0375" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_45cab8b4-9f3c-4a0f-a846-8704a8474908" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7305509f-91ac-4785-9e35-d9be86689435" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_3688bc8e-9718-4a86-b00b-41230dcb50d0" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_12af558d-60a9-4377-8b2d-a7f2a23ea592" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_72428c60-5112-4123-997b-5cfc316d80ac" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_83dfba7a-eaae-4a98-9308-73a4b755fcbd" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_1816b7f9-ee7a-4b7c-a941-511bbecac022" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_4ecda823-53fa-4a33-98e9-2836b75c97f9" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_dc2b2597-748e-4028-b3d5-fe8e904f60cf" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7bc06abc-6f8f-4919-93ac-faee0adb74f6" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_58fe6025-b86b-4404-a840-ffddd4a7dcbf" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_a9489baa-163b-41a9-addc-3716b3d632a0" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_603b239e-e4f6-4e1d-9ffa-f7ea86a1f9d0" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_65e27f26-9fe5-4698-bde5-1861d540c443" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_9f1a22a0-4d80-4fb7-8c4a-ae961aadd5c0" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_5252e8d4-4da2-4fd9-9757-400370027bd1" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_aef2f522-6391-4954-ab09-bd2e51b33e77" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_bb92aaeb-2cd7-49f6-b56d-fe4e564d0637" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_5108d3a4-a5d0-41f4-ad23-f94dd47fc6eb" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_f776be08-ed47-4546-88c3-b3a36f8af9ce" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_2657a858-f178-4177-99a3-954ac8d5ad43" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_642607fe-4039-499c-892e-f0961205a98e" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_4676ce0e-fb0d-4025-b18b-35a7d7004a9d" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_ce1c5093-cd65-4699-aa34-5024811a29d8" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_4019ac81-4117-40e5-b520-62c112534cf0" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_e91e85f2-3fab-484d-85ad-46726fdba456" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_008e4bb2-22b0-403c-bdf6-3823d44044bc" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_3383327e-a0a1-44c9-8bd0-b2b7e003c1dc" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7a63dc4b-41e9-4619-a219-c1eeed2af426" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_44d9f271-1434-4d83-a3f6-838f6d9f3996" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_a95e311a-3c11-4941-99fd-eeda24f1c451" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_0d19ff48-918d-4b69-868c-d126c29a086b" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_cb1b46b8-de82-4688-91b7-d2acf20b1ccf" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_11af5dce-1680-4352-ba64-ae15225ca258" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_48be2832-e377-4d76-aea8-f849bb1c52ea" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_6cfcbf4e-8ea6-495f-be05-355bbf263746" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_d12f720c-a3bf-4fa3-8ba9-a8c4b67dda74" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_9b267b8e-1675-40a3-af26-2cc1e5e23c92" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_6d8ce562-8926-4bc4-9b46-8a0c7250d59a" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_59104e74-83a3-499a-a668-ec4b20f007ba" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_720fb497-c82a-4502-b114-aedd360c143e" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_537b24cc-80f9-41fc-8baa-0646d7579ad6" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_f13638c7-2b81-469b-b7c2-21b974eab936" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_3e4e65ee-2b29-409b-b4e4-adaced47ae6e" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_70d2ea8e-bc6c-41b8-8b2e-03e2f4290045" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_a8bbb716-53db-480e-b78c-bfb84fe76328" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_d02b9544-ddf9-4f42-8a50-1cb79ee9f3ad" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_c9757827-30e4-466b-988f-24a51099a868" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_b3483514-d846-4af9-8ebc-14326f256f1c" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_bd8f47ff-35e7-46b6-ad2b-2abb6dfac19e" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_3e2f4832-a7bb-4305-97f5-e891657b6de3" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_0127ba30-5c6c-4ab7-9d52-146ffdab6710" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_835b6b8a-ffab-4065-9066-7ce23a70b6f9" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_97c38385-cc8d-432c-9b86-179a967699ba" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7e67ad3a-f8b7-4eae-a88b-26f125eb1077" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_e43ed2d0-aaf2-41df-8f7e-9fede134320c" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_42f2240c-a0d1-4c15-8060-97406da32e02" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_8f2e85ff-6a1d-446d-9ad5-dbd9acac84d3" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_bbf8f9d9-0d88-468e-8fb6-a24670e6bf03" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_baa4bf42-622c-474f-89b1-3ae0440fa746" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_82f39669-a920-4209-aa74-f2fe3136b2ba" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_d732dbfa-e701-4b8c-af3b-2cdda0e8eb0c" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_eaedf54f-cc44-44c9-8d44-75da3cc5f61f" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_965a3f16-f641-4529-89cd-ad84f0130199" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_72ee85c9-540b-4f35-91b6-56e4923fb36f" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_45bbb0b8-6f2b-44b1-9238-71fe562f41b6" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7ad58852-99a6-467d-b22c-a37129b90bf2" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_76ce837e-0daa-4f53-8109-1aa4e095f55f" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7a14b013-58e5-44a8-b6f7-bd8ac8038daf" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_9d986998-2d3f-48c1-85fe-ffd532588d8a" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_4136597d-33a6-4397-ab23-9201a70050ad" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_2efabbd9-11d5-4110-b93b-ed3666e93323" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_567026d2-9ca3-47dd-a6b8-e2b63c5f494f" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_13c1ab89-82c0-4d3b-89c9-73e152be8e19" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7a3ca1f1-2988-478e-b6c5-307a129540e8" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_f22288e3-3443-448e-9aa9-8b7542fa82fe" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_fb8eafa9-1dd5-4944-970b-135633f18379" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_d84e4008-38ba-4280-b2e3-986b788194ef" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_c8ce1f8d-b2bb-4916-ab1d-902db4327363" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_c395b8ba-961c-49ed-ab16-1f8cf44428fb" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_439769d0-5eb3-44a1-bad3-fc11d381c712" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_cb8742c8-ff0e-41d0-b894-17e85761684b" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_f3086fc1-aaa1-470a-a379-dc8b1c5a44de" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_cb961cc0-f6e4-491a-b245-93465744a429" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_ee4bb02d-f023-4733-8b35-ee1cc05ece38" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_c95b37a4-c92f-4826-9122-92692dfb0e84" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7551e6c4-01f1-49b3-a14a-320930d0d924" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_652b5913-b054-4d98-a916-ada57177fe7b" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_243855d4-6068-47a4-bb40-851716c323c1" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_fc9577c8-6a67-424f-a404-2c02a8ab5614" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_175d6121-6327-49a5-a1a6-121392a048e6" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_0a0d737a-02a9-4441-b955-84be532ab570" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_19a51158-72e6-438d-af7e-d5ebc04c0985" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_688ba8f4-8011-466b-ad3f-0c91c0145b42" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_a69e80d1-e84f-42e2-a94d-80f02ab1497e" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_1ccab59c-06af-4a8f-a28b-bda33d36a62a" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_8ea91c6b-4e08-445c-8db2-db3bf9c02d25" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_98502b5e-416c-43f4-9238-8c9e39b1adba" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_5acc36d8-d4eb-45b8-b700-bcec1068113f" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_6bd2b510-aa2a-4b04-bc96-6fd3c49a52ed" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_39a7fe19-cf78-4fd3-b9f5-25e6b79917b0" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_2b22655c-6cb0-42a4-a4cd-6bbb8bb48e31" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_256c16df-4ac3-4a0d-9cbe-4a65d832a818" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_28e5df9a-e33f-4742-9e2b-d2624c159842" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_9c4c3ea5-61b5-4cfa-9d56-3846586a178f" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_131148c2-6cde-4a27-8459-95a66c210dff" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_e4941205-340e-40dd-8da0-34df7257773b" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_2079b634-36a5-473e-b2e2-cbbaf747f66c" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_31cf4645-dffd-46d6-9f34-69c2c378ebb9" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_b7e3727c-93f6-4d1b-a206-f338869972fe" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_98504bd0-dbee-4cfc-813a-7e52160e9d57" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_985c5a83-27cb-4d34-9475-e3a6bf765ee7" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_dae6071e-cc08-4e85-99e1-f82727b00ce1" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_ea228a89-c998-471f-aeb9-7159417f53ce" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_837155cd-3234-490c-a417-4e1137dbab7a" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_e90d005c-1784-4ec1-b8d0-55aa74533f68" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_a013e874-a436-494f-a218-13cb59c83e91" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_c2c14b09-3cd1-4012-8a32-b454b7964f72" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_dbb3b41c-ac54-4360-bd29-0e1ac6a201f7" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7b70ebc7-2336-4793-9905-397bb2a566e9" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_9b8f3cfa-4e2a-4c54-87bc-fc27bec2e289" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_9cc2a152-ede7-44f7-b5a4-bbd5b6c0e8c9" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_122f37cc-22c3-4c4f-aa78-8a8f4503e8e0" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_938b04c9-c990-4c76-a5f2-87e10f43170c" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_f186d157-3b6a-42e0-9dc5-221de5b3f8a1" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_a1524797-796b-495b-b558-53c56c22c67f" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_47261bc1-3881-4179-97c6-27adac5610a4" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_096d15a6-ed4f-4ee7-836b-3352b5d207f8" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_ab9b2303-66cf-445e-83c7-c916e59cb265" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_7feb9df0-8293-4d4d-84ce-d7c46c5a4f22" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_80a60d5e-cbcf-477b-be32-7a16ac11a930" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_906d3a53-0dd5-451b-85ca-5a6ba3d53769" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_abb94047-3b0b-495c-9a26-4c397dc09ee4" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_48b0eaa6-bb6b-4735-b28d-7d3f93472250" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_cc81d843-b4b7-4861-99db-12d97b6f1aa2" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_3a028a16-a16f-4371-9c61-16f22df0a6ec" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_8fd2b7ef-90e3-4558-b6e6-60422c038464" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_5c32aaf6-4d9c-4d42-8249-4c11fb7d9850" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_f2550c58-534c-4a9a-8e52-d9611d488f3b" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_8f5002f1-d9dd-4a05-a265-1ca7d3812904" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_749fecfa-f6df-4982-9c43-d71d4b5bd907" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_67403378-84b2-4f08-84fa-0700797a11a3" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_5f8b580e-4b26-4883-8fce-1815549a805c" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_9ce4a580-6daa-417b-a7d9-d89dd0a6bb2d" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_b978cc8d-148b-4431-9d52-3c122cfd480e" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_eafd7afd-859d-44a8-a171-f2544cba8e1f" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_e6336729-505a-424c-9c67-92234a3edf66" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_074d7157-62b9-42bc-a35d-aa794164de62" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_07a89c17-75d1-455d-af3b-369019a3ce41" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_756f42df-3489-465d-9b01-904dc56c149b" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_c1138427-e2df-4b19-80dd-e9d3115c62a5" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_8cb7e1fc-a3c7-40e5-8737-264bafda2597" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_63a1fd41-c1af-4298-8f3f-fb519e62025f" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_1b771a61-24a9-4c53-9653-c2d95c7f09a7" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_2100d9ce-320d-4a6b-b6fb-f45ff4686378" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_aa5969a3-4f38-45cf-b577-976834c76d5b" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_9c10a5c4-4d3d-4210-9019-30f74a337cfb" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_55623860-725c-43df-8a55-6a42ec958681" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_a4de83a0-817c-4aaf-a00b-f5c60b0d0dd7" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_63f1ce53-32ae-4c7f-8c57-9d3e7b75e47a" /> - <xplan:praesentationsobjekt - xlink:href="#FEATURE_bd2d8840-76c8-48c1-a7c9-254951cbfbd1" /> - <xplan:rasterBasis xlink:href="#FEATURE_c2a83b1c-05f4-4dc0-a1b6-feb1a43328d6" /> - <xplan:gehoertZuPlan xlink:href="#FEATURE_2dabcaaf-f831-4d73-b9bb-04b78f52ed54" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_b07f7df6-a860-4e5c-a587-c732bd0b862c" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ccc4f068-4150-4779-a2e3-39a5e7185fcc" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_7cbc8a89-b541-4d41-8e0e-28e27a44d496" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_423960c4-3287-4432-a123-ad3b13a5a63e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_68eea76d-20a9-4dea-ba2c-ea95365bccac" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f2c01fca-d25a-4cee-987e-5c98774820e4" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_a428ad2d-00fa-419f-ad00-5d271efaf78a" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_c0a46d54-2873-4f58-a7bc-adb17c9e1c34" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_cf5a4332-942c-4aa5-ac3b-c3f48fac1d9a" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_21fcb09d-da45-43c6-bc90-6818cbae2ad4" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_d4266308-5fd9-4919-a7b8-d728c5add1ef" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_09c77af4-5c09-4472-9021-8d8364aa517f" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3e6af0d8-57e0-4b22-a7dc-a0a8445bb0b0" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_22af83d9-f3aa-44aa-a0c9-bd831c97148c" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_d5217f8d-a4d0-4bc7-8087-0990106a747e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_d4b2457d-b7d0-4ea0-b188-97dfc8458cc2" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_cf004391-d241-4f80-bec9-10982fceae1e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_0e9ccd04-1890-409b-8c4f-5254fe84b3d5" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ad908b4d-8429-469c-991c-7f6a67296c70" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_610e51bd-770e-427e-9f8e-15525a58668b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_95ea436a-66a2-402d-b88a-ede3de3ab7f9" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f8925e8f-9c47-4dd5-adb8-328b10d40792" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_422e3e27-5c64-4172-9648-579dcc956ef5" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_65d62881-955c-4e14-a2d8-5fdc75d5a045" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_69004834-95cc-4575-a5d1-b55ff65e7a6a" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_b2e7245a-222b-427a-9c57-bb0918b96756" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_06264d65-cb1a-4540-81fa-1836840c9740" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_d236d1a5-b387-4419-94c8-4211b5fd1d17" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_c0877d2b-3407-4efe-9e31-54472f047409" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f2684dfc-07d2-4582-80f5-39db3e841c24" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f1d8fb7a-e823-4324-860a-3a306c2f56aa" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_8b62af3d-f63b-47e2-b93e-687191b54e97" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_14d10e01-6ae1-45dd-b101-f0115b409043" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_1f85d8c9-ea29-40f3-8d88-9080bf6e44b9" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_9cac047c-c94d-4f3e-9d2c-01b98bc51a86" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_b8aa123d-4266-4447-ab0c-f5c5200e5cc7" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_13427f95-88a6-492d-a094-452ebaea2c71" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_cd911270-eb86-44bb-a64b-8232a8637d57" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_06c6bfd7-2a79-4e6e-8ed9-685f5adcb7ee" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_1418749e-715d-4f00-add5-02f04d0d66ac" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_5d2fcf6c-be80-4c2e-a27d-4f561f2e6e03" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3f4bea27-a89d-478c-af39-5e3a5b36ad73" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_36c557f3-9e16-46a1-8695-4cac4968c98a" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3adf4f15-28eb-4479-8b95-5fd915a20e3b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3f4148dd-ec1f-41cd-bf97-95ceec6246ea" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_1d2d7d28-99b0-41ad-b7df-2438a70d9de3" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_5d463a3c-ac4c-45a3-ba49-cb2e18b14f24" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_57a3354c-bf84-4f39-be61-e582853f73ea" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_7896d13a-2b65-40a2-bc82-7e12710e81cc" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_a0b1e82e-a529-47e9-a8f0-71305b614ef3" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ba48dcf8-042f-4c38-bb74-10895cd736d3" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_25f1af5b-7c1c-457a-aaa5-6016667b177b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_4efea97d-3719-4172-b93e-dfa4bdd268e1" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_7c1baf08-753b-4f7c-9c4f-b50b193f8552" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_9de8c349-ad84-4543-b028-0017481ab9c7" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_dbaa6ed4-601c-4070-9e92-1776e5857a09" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_42b5abcc-9f76-4631-a234-f3e3251b2f8e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_9ca96ef1-5861-46be-a6bd-5f3d8e76c539" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_4cabaf5e-3a10-4272-ae8b-5117efc65ba1" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_244e89d4-2858-4941-ae49-3df73fd1c179" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_4c2a3e37-aa73-4f5b-96c5-3e7183c23c7f" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_7bdfbfad-539e-4a92-ad79-ab71ac733ab6" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_854cf049-c53e-4f64-8fe0-85be0422dd4a" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f8168908-ee40-4c6a-94b8-c60e908c6e01" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_d7918786-60d8-4cae-a32c-84bc5a2a6293" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_459b94ec-6b40-43e3-b1f7-b5af1213c16f" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_e0ec3321-7a60-4acf-afc6-7012adce444d" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_8e93564f-04d8-48ce-8bac-dc9f055f4876" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_95e60410-12a8-43eb-a1af-e0a01148232e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_6e71a8d6-7fab-4996-8874-0dd1ad7d9202" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_d60e88e6-05d5-4d0c-b644-a18b912dd003" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ff7ddb8b-f7e7-433d-b3ce-a3898b614669" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_56078ddf-aa75-464d-9f5c-2b25f2e1b2f9" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ad40fa85-9105-433a-9ec5-5efef031c7a4" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_87d3546b-e4a8-4acf-8acf-cfecfbd766df" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_fde3f40d-b7a6-479a-9469-3d736e3b86d6" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_1b9097ed-8dca-4499-a916-95f5ece2dd96" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_059c7335-42f9-4675-9328-93408ee0e134" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_9455f3d1-0f38-4d66-8e09-c13c95c3758f" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_cf12e151-209f-4449-81c9-17d2e1da0aca" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_65a7be1c-d9be-423e-924a-ca8e0dc5c574" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_9247e6b7-350c-4059-8b07-9873d6d97d56" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_89f8490d-8a72-4c72-b7f8-a3007e056e2f" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_369513aa-097e-44dc-9735-035902511fe6" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_22343ddf-8132-4f23-8e70-08135868babe" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_978f9e2e-8b39-4366-8285-78d813426517" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_787da1bf-5cc0-4f2f-87a9-73ba33508983" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_42bc26e2-76a3-4677-b45a-25404fc9117a" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3d8cad97-e03c-44b8-8955-b0905177dcb4" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_10c8146b-3a7b-413d-b636-ce2b91dc1d14" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_1e17b22e-b2a2-41c8-b1dc-26734059574c" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_cc3d661e-1bb7-4af6-9cb4-865409e95171" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_b18299c4-d9db-41c1-9b52-440205f6cec8" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f912cbec-fcbf-4dc8-a383-430ae3bb4793" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f0b69e9d-fb07-4a58-9865-0427469c15f0" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_cc7598e6-b304-4171-a2f2-c0110d523bd3" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_e56bd634-c7ab-4b13-b355-9ef3eda0ac62" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_53c32b08-498e-4cec-a185-fd3cef77fb46" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_485f606b-9ed3-4fd5-9929-6dede721dc38" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_51be1969-5bb3-434e-ac3e-8c295831901e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_5adbc6a9-70f0-4227-b356-ea11793aa292" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_44c1d85d-d696-4946-9868-7c5181e9d644" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f88440bc-7e64-4340-91c8-56c26143a4c9" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_1eeba484-761b-40bb-9110-be43ff30db8c" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_c7281ccb-0e80-45dd-b922-35fafa44365d" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_8e5930c5-4390-4abb-9d97-00126eb3925d" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ff2cc402-89f7-4a77-86c3-d9f824d9c0a8" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_17295bff-c878-445b-9b8c-5f94cf1c0694" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_0b214989-d0c1-46c9-be29-fab3d58dd76d" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_0e239322-c8b6-4956-8282-2c9575bf01a4" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_8b5d3361-66bb-4bf4-9444-d588f1e8f9db" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_7bf8034d-7e3d-44d8-8b68-88b585159664" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_fdb5fd05-f173-4b46-a549-471d80bd61e7" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_eae22aa8-e056-4616-8aaa-bf4bad0ef763" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_cce57717-2641-4757-a45c-828a90fddd22" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_6b2048c8-f3c3-4f68-a624-b12748292bdd" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_7ff21520-72cf-457e-8d61-ad6807dce1ac" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_6d051170-29ea-4322-8fb3-1be5c69dd5b2" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_67cbd473-9c19-4712-a661-80cd465154f7" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_7ccf4e93-51c0-4478-8a60-4f9b9daf0a84" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ceac03f0-cde5-482f-9045-593147f3cf5b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_23df0455-dfc0-4dc8-a0f7-44552314b843" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_4736602a-d396-4b84-bffc-bbfbe502a557" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f0bdf994-6a8a-465b-b2cf-0cd258e6d730" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_18b36f7d-94ed-4f1d-b75e-8b32c34abca5" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_9114c88e-7a81-4c4a-aa70-0918793086d8" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_0b00a561-2269-4993-8719-5bbe635c6dc7" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_256f154d-45ca-42a7-a4f9-7f0102d19aa1" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_278e9068-da28-4434-9354-ebf271c1d62c" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3ac5e89f-cad1-4b0b-ae79-78751da3538a" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_38af2111-33f2-4bda-b5e3-2100eef714a2" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_feb42b64-6c4f-4b5c-bee4-ee3cbc389bd0" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_c0d2fdfa-07bf-470c-9bf7-2f84fe2ded51" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_490410d6-02c2-4e67-91a2-18ea2d9211ed" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ec3f6734-0402-4a91-a4f3-539d02f3cf65" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_20437b8b-75b4-4108-86c3-e8a94984b4ee" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_bb964c1e-b7e6-4c53-9045-2619aa7afed3" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_4b725b51-c437-4935-a8a6-4fee598e4a48" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f73b7fd1-2de1-4cf8-aa4f-b4065c00e890" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_be7846b5-f38c-4c9f-99e8-12b735131808" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3f67cd8d-c1f4-4eb7-9e91-03c1a4ff3636" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_6b909a3a-2c61-4980-8f7a-7d5774b93bda" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_d0045421-8b78-4e91-9765-784761d6932e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_c316056d-a198-471a-a1b0-db777bb29edc" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_6b467bbc-795b-4153-bf0e-3c3badd5ab92" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_e55858d9-ce88-4b9b-95fd-a7fef97c7843" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_382e6315-e332-4eeb-9666-6b00201aa952" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3be175e4-602a-43c9-8429-447119f49f00" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f57cc03a-4a22-42e6-828d-27d2278617f0" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_d2081509-c7ff-4f67-bf85-376854ee356f" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_e0c05239-f478-4b69-b467-d7c9cf260b48" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_08368137-ebee-4adb-9cda-af575501380d" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_b3ae535a-6cba-4d7d-a1b6-22a1ec8ea1ce" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_7b27ce6f-c972-434f-8264-ea1f52131dcb" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_4a139de9-e8e2-4914-9efe-ddecb8b86fdd" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_2c3b1999-d2be-492e-837b-5bd2b51eb9ef" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_5b3e0ef9-2979-4a6f-a207-c38198db953a" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_48332228-b6b9-4a34-8d67-2a38f977252e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_af52620d-f6e5-4305-a9a0-d2c8c242f4e1" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_6ebaaab0-fbbc-4b7b-8ab8-c36e753f4378" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f5a54a01-648b-4ace-841d-afefb59fe95f" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_29c0fc88-d378-4775-9c65-a48159e0236f" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_6958e516-5a58-4277-92b2-d6f34e908ae8" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_b2f1c863-0c9b-4f00-8aeb-7dbbbbdb5b03" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_af42aafe-9cf9-4d85-b0f6-02dc658e7a76" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_e5525d24-4d77-4448-858f-b3571e386c3b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_1445a560-4206-4c5d-a0e7-f7421f7becce" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_71ccf722-b097-42b8-8915-ac27b62fe3ee" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_bd9763ce-38d8-499c-8767-d1ad0d44d01e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_d3f77899-698c-4530-9bf0-9446c4e97950" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_b62b9984-8832-434d-83b5-b8823ac4b5b3" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3255aa7b-0412-4a3f-b842-5b87e7ed40b4" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_287a2c93-bce5-4f54-9726-06b5db90018c" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_86e2767d-4ca6-45a2-89c2-0c30b23227f4" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_dc61f364-f67c-4e0f-846c-fb8da12644fe" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_a83c1514-3b9a-4e49-b502-fcb0e7c9ffa3" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_d9d651cd-9e68-41c3-87be-860491bfdf36" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_603c75ea-4fbf-482a-9f87-2b9a288ffe1d" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_eae9cff7-e604-4c96-8807-eb8f0973c5d0" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_4a3cdc90-4da5-492e-8a63-01dd4a0133f7" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_44d17c67-bfb3-4485-9851-ca3e47858327" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_1cc16f65-20c7-45f0-92f7-23856103ecf7" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_b25c7075-2375-4332-8a9d-f2f3ed5b8e8e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_aae87c56-cf3a-463c-b69f-e24fff8d77bf" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_5fa6caac-1743-433b-9065-25a210410016" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_05ad0484-0015-4d0a-b719-8583ff36690f" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_4240a722-10dd-4e12-a8b2-baafe6f9f05a" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3c0f883c-e3a1-4d59-959f-e955ea2f3247" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_6b27582f-5868-43f3-9faf-63e0617a180b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_1e95ec8d-3bfb-42ea-bc05-8b3be6bdd84d" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_dfcbc49d-2a08-44b2-ab4b-e1b3b674895a" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_eed516a0-9661-41d8-b4e1-672cf1b5c76b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_b7d5ec2b-d63d-4a10-b41c-61679c5b758d" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_55990c4f-23ea-46f5-a1bb-5ae86d37fea9" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_377cdfb8-dd9a-4881-9760-b0de52fbbdbf" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_375a2000-f10b-42eb-87cb-d000168a88f0" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_4361be95-29a2-4348-961b-c9060a99d7b4" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_2f3b1406-a7d8-4e86-b568-02f20b5bb8e5" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_e1ff0c10-daf0-4e75-b6a3-a943fb3b485e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_87082b0e-601d-40b3-9495-e1944e098007" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_5bb176a8-c7a3-4c72-8f37-1a329c27bee5" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_c4aa4abc-04c0-4247-b03d-de3292c73747" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_791e32d5-eec7-4827-a239-d21487f7e398" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_2c547146-ad4d-4b50-9ce3-6afd765dda79" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f7cb6654-c07c-43a7-a640-c3434627974f" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3fcf3a0f-0e55-4dbc-b6da-83804d34fac3" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_9484525d-3973-4ce2-abac-e0c506420680" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_c2942af1-b1cd-4b82-8db6-ef40356faac8" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_9e8ecf6c-31dd-4653-92c6-778112186450" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_d78d0f47-8f70-4db7-b567-ca53436028a0" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f0be0a24-5afa-428c-9bf2-16f1f292d8c1" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_45b0ce1d-f165-4b5f-9103-a99f08bc14e7" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_58eb3f09-1d67-4673-a45a-255d7062efa4" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_bceeb912-0a80-413d-8aa0-f61bf891808b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_01724502-724c-4e01-ba12-d2e087d87736" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_05915fe5-fc8c-420d-90da-ff71bad29cc5" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_befe2947-9ed6-4b77-9a3e-8ae5ccb48552" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ce6704d9-fce6-40b3-86e0-a91cb47c6ba6" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f0b1cbcc-50a7-4f51-9cd2-5843fca532c2" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f842da25-a537-4ed9-a7e8-13372cdf5a2f" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f7919e11-2fbb-48cd-81ee-ec998ae00aaa" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_1a455704-84c0-4215-b188-8d9b9920f8da" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_53f5ab66-4e2e-43e6-acb8-2ab012dba9d1" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_b95bc0ee-8a72-4ddf-aa72-251ebedfb3d1" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_eb3d2ecc-842b-422b-9541-4abf52836d08" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_56e1c6e7-8d59-4d11-a378-ecbd48a7cb84" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_330317d4-347c-44bb-9bb7-f06fe828fe6d" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_d0662e2a-ef98-4b08-b552-ed06bc6f2418" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_359dd4f5-0ef7-4f5a-b609-c8e803fe634b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_55340158-5ffb-43be-ade3-97f841e26296" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f7b8d361-8b30-42a8-b2f6-7b9edab17d1d" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_2c94f717-ac6a-4461-86d4-1972dca3a3c9" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_1e3e4a7a-452c-4c13-973c-a8db2a6c8c19" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f9fa5016-c335-47a6-9ea9-7cb697767bd1" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ccf9831e-4643-404a-809a-9932ef3c8ea8" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_cd972b03-43e6-4e1c-8f02-91382e0d9141" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_6027d8b0-cd14-4f3c-bead-0242910d254c" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_8d78a76b-08d6-4435-9dd9-7e3b1a881e72" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_688f9dee-b1b3-4888-9bd8-91ddf032aff0" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_438e2b50-46a8-4a72-b07c-bfc11d9bb441" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_68d88e9c-174b-4004-963f-2378442fe60b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_e664d7ed-55a0-4bbe-806b-3e022ce8fe32" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_be49214b-b615-4c15-b481-9e2e1931c408" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ecec985b-9d6e-408d-a9f9-3d25e55ffdf3" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_440a0cb6-be5f-4887-9f07-80527a8c39a2" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3fd0410e-bb15-45ec-8b85-448c476a4aba" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_62cb5aee-ef7b-474d-974d-f6812c8164e0" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f47f7930-5406-43fd-8f1d-ca857e34e760" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_14c2c6bc-21b1-416e-92d9-123bbe8b6034" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_c514e3ac-36e3-48e0-ade5-deae4b3d8f72" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_c3f2f8ef-4001-42ad-b457-f926d747eeb1" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_755b02af-c700-4cf2-99e7-d7c06ddcb6ba" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_df8d144e-8a81-46e9-91a1-9e772d06cd97" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_35bb656d-b631-4682-917b-b50086508b9e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ad3be022-ecf0-4e82-a837-f33e86b70946" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_b8fd5b1e-3deb-47af-8b76-3754b36289ba" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_2f97a641-43b0-4eeb-ab03-b32327f61126" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_6b3375ba-d95a-4ede-8387-6067756fe176" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_4c329170-c944-4a3b-813e-ccd70cfba0f8" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_0e48ce56-2631-4dfd-b35d-33be642f092b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_79dbb913-dfbd-48f2-858d-dafb6acee44b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_342b956b-43ba-4f05-ad9a-47c5921a824e" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_7afeb10d-2ea0-4b4a-96cc-ca9d1676dcef" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_509ac533-bbbe-486d-b795-f6cb90275ea9" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_437dfcd8-8acc-4758-b97b-01a69ed0847c" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_60b30a1c-33a0-4bc4-9a03-9b68a4cd77c1" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_7ab205db-a3b7-459c-b70c-a745480b4220" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_ea46d8a3-a8db-42e0-a7c4-7c2fa857d24d" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_6aa141a2-c183-4bfc-87c1-f6f7bffb55da" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_50de093f-54ec-4b7c-b572-6fe2a7f1bc1c" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_52730d09-297a-4c8e-bfd9-516107ab3283" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_0f2b06b3-98f7-4e49-9cf0-39e987cb0315" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_dfae2e63-d763-4b25-a033-63268f76f5f9" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_0dd4c31b-3818-47af-be9b-1bb7e119d74b" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_c9da0389-680a-48d8-8287-dc50277e251a" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_e7f10651-4e42-414f-bdb5-de83d4bc97a3" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_abf491e2-2901-4d6f-80f9-445c6813738d" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_93e37b87-e3ca-49d8-955a-e323a4984274" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_835ec818-6b81-49c3-a994-4a66b960fdbd" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_5d1bd0a4-714e-4d5b-bd61-16e5bbbdcefa" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_eb807173-aebd-46be-b685-fa3643324fb0" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_af0a785d-3fb6-4159-8e18-bf3a7f717b82" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_1e98d860-d6ad-44c7-8093-cb9e3b1ee5ac" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_b3bbcc81-5f42-4a2d-a690-0e76d52e1821" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_0fdd4093-9a3e-449c-93b7-5af70d0ab774" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_c36f18da-d134-460c-ac43-ad8c3fef7c13" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_3e0a98f2-aa40-4fb6-a208-9d340b4e02eb" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_f6e099d2-269d-4601-9181-0976b5fb6f66" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_99c488c9-053d-4923-8ab3-b07c8dd6a5c5" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_a40d26a1-8893-4c82-b210-38b2750927d9" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_e5c52029-ebff-427c-8317-3fe51fc9b976" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_a814dd49-e7c6-4518-bdb8-206a148150ab" /> - <xplan:inhaltBPlan xlink:href="#FEATURE_da4a0948-6a84-472b-9954-aa7d17464dce" /> - </xplan:BP_Bereich> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_FirstRichtungsLinie - gml:id="FEATURE_08368137-ebee-4adb-9cda-af575501380d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_2a57ad12-443f-44f9-a41f-afdce37ec768"> - <gml:posList srsDimension="2" count="2">418454.137 - 5715910.632 418434.719 5715911.89 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_FirstRichtungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_FirstRichtungsLinie - gml:id="FEATURE_382e6315-e332-4eeb-9666-6b00201aa952"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_8d97715f-6144-40be-b9de-09beb1ec17af"> - <gml:posList srsDimension="2" count="2">418112.169 - 5715854.827 418093.227 5715850.509 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_FirstRichtungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_FirstRichtungsLinie - gml:id="FEATURE_3be175e4-602a-43c9-8429-447119f49f00"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_35f6f044-90ad-4d8e-af52-c4a8e1d354e8"> - <gml:posList srsDimension="2" count="2">418254.019 - 5715888.961 418234.985 5715884.56 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_FirstRichtungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_FirstRichtungsLinie - gml:id="FEATURE_4a139de9-e8e2-4914-9efe-ddecb8b86fdd"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_65f41bdd-6665-4b05-af38-96f7dbc02a91"> - <gml:posList srsDimension="2" count="2">418407.197 - 5715946.876 418387.577 5715948.204 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_FirstRichtungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_FirstRichtungsLinie - gml:id="FEATURE_6b467bbc-795b-4153-bf0e-3c3badd5ab92"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_05bf8284-d4ac-459a-96ac-12f49fe48bf8"> - <gml:posList srsDimension="2" count="5">418112.262 - 5715747.91 418104.643 5715741.991 418080.189 5715758.918 - 418086.199 5715767.711 418096.948 5715769.745 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_FirstRichtungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_FirstRichtungsLinie - gml:id="FEATURE_b3ae535a-6cba-4d7d-a1b6-22a1ec8ea1ce"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_e1542ea2-6fc3-46dd-9962-6f384e3563fd"> - <gml:posList srsDimension="2" count="2">418326.725 - 5715939.839 418307.499 5715935.265 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_FirstRichtungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_FirstRichtungsLinie - gml:id="FEATURE_e0c05239-f478-4b69-b467-d7c9cf260b48"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_a2f905c6-20d7-449d-a2cc-6149368524ba"> - <gml:posList srsDimension="2" count="3">418369.243 - 5715916.618 418360.184 5715915.593 418351.223 5715913.476 - </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_FirstRichtungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_FirstRichtungsLinie - gml:id="FEATURE_e55858d9-ce88-4b9b-95fd-a7fef97c7843"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_1de577c8-871a-4c74-ac3f-82b3492fad6f"> - <gml:posList srsDimension="2" count="2">418125.4 - 5715769.552 418135.714 5715753.4 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_FirstRichtungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_FirstRichtungsLinie - gml:id="FEATURE_f57cc03a-4a22-42e6-828d-27d2278617f0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_97570680-7def-4ed6-9547-563715bce71a"> - <gml:posList srsDimension="2" count="2">418213.331 - 5715912.534 418194.209 5715907.952 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_FirstRichtungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_GruenFlaeche gml:id="FEATURE_09c77af4-5c09-4472-9021-8d8364aa517f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_067dc761-a4df-4373-b68d-1afd9e923887"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_d4abcb85-776e-4f8d-9e55-3c0df3448057"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="17">418460.249 - 5715694.026 418503.134 5715700.375 418496.968 5715724.624 - 418496.216 5715727.983 418487.652 5715735.774 418478.242 - 5715744.348 418469.148 5715752.631 418457.489 5715763.255 - 418447.696 5715772.183 418440.755 5715778.506 418431.606 - 5715786.842 418420.107 5715797.319 418421.955 5715792.547 - 418434.407 5715760.511 418440.038 5715746.034 418454.526 - 5715708.75 418460.249 5715694.026 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - </xplan:BP_GruenFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_GruenFlaeche gml:id="FEATURE_0b214989-d0c1-46c9-be29-fab3d58dd76d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_68b194f6-6d9a-4c26-b51d-b6f5790b818c"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_13cc84a7-e282-406c-be93-011761e371bb"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="13">418081.185 - 5715948.824 418084.29 5715939.262 418089.053 5715924.594 - 418081.186 5715913.495 418085.051 5715897.931 418132.488 - 5715910.538 418120.597 5715934.166 418164.124 5715951.571 - 418157.999 5715977.238 418117.296 5715966.914 418105.754 - 5715963.987 418101.213 5715961.185 418081.185 5715948.824 - </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:zweckbestimmung>9999</xplan:zweckbestimmung> - <xplan:nutzungsform>1000</xplan:nutzungsform> - </xplan:BP_GruenFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_GruenFlaeche gml:id="FEATURE_17295bff-c878-445b-9b8c-5f94cf1c0694"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_0e68cad3-8c7c-4875-9a19-e7092f4d6a44"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_450d39b6-cc6c-428e-9aa1-b7f17addf735"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="17">418499.501 - 5715930.538 418513.199 5715929.655 418512.209 5715930.811 - 418498.02 5715947.369 418438.52 5715990.115 418416.866 - 5716005.666 418410.434 5716010.358 418378.954 5716033.278 - 418374.8 5716032.225 418388.345 5716022.295 418418.477 - 5716000.865 418440.325 5715983.774 418472.164 5715957.331 - 418481.774 5715949.35 418480.992 5715943.443 418479.455 - 5715931.83 418499.501 5715930.538 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:zweckbestimmung>9999</xplan:zweckbestimmung> - <xplan:nutzungsform>2000</xplan:nutzungsform> - </xplan:BP_GruenFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_GruenFlaeche gml:id="FEATURE_22af83d9-f3aa-44aa-a0c9-bd831c97148c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_56554c4d-6f65-4d49-862a-b89a36af66fd"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_e47d3e40-8a2a-48e4-9b1f-e2213704d2c2"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="8">418110.407 - 5715826.26 418119.974 5715788.13 418143.976 5715793.344 - 418136.707 5715824.698 418135.479 5715829.995 418131.895 - 5715845.475 418107.058 5715839.617 418110.407 5715826.26 - </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - </xplan:BP_GruenFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_GruenFlaeche gml:id="FEATURE_3e6af0d8-57e0-4b22-a7dc-a0a8445bb0b0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_fc449ebf-3e56-4a8d-aa58-64eb7db043f7"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_dae34b9b-6a31-42e3-9a1b-6f7c558dace1"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="8">418442.161 - 5715818.749 418470.2 5715826.034 418507.655 5715838.463 - 418493.482 5715888.664 418492.745 5715891.277 418426.509 - 5715874.521 418427.153 5715872.225 418442.161 5715818.749 - </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - </xplan:BP_GruenFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_GruenFlaeche gml:id="FEATURE_53c32b08-498e-4cec-a185-fd3cef77fb46"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_294068b3-28b1-4433-8d7f-50d6a9ef37e1"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_81608d5e-9bd9-433a-952b-cf9bcd0ddc09"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="27">417999.507 - 5715907.857 417999.235 5715906.761 417996.444 5715895.096 - 417992.619 5715879.509 417984.551 5715878.596 417957.658 - 5715873.534 417960.41 5715869.434 418002.387 5715868.994 - 418006.61 5715868.311 418009.989 5715866.869 418013.705 - 5715864.495 418016.07 5715862.291 418018.349 5715859.495 - 418019.615 5715857.208 418020.542 5715854.836 418022.156 - 5715850.36 418031.378 5715853.914 418034.1 5715854.607 - 418030.052 5715867.071 418029.037 5715874.61 418035.417 - 5715876.486 418023.449 5715913.193 418041.609 5715924.4 - 418036.96 5715922.782 418001.213 5715910.293 418000.013 - 5715909.874 417999.507 5715907.857 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:zweckbestimmung>1600</xplan:zweckbestimmung> - <xplan:nutzungsform>2000</xplan:nutzungsform> - </xplan:BP_GruenFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_GruenFlaeche gml:id="FEATURE_65a7be1c-d9be-423e-924a-ca8e0dc5c574"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_12bf7322-ded2-440f-b74b-bf446833dc21"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_63cccaa1-8006-41c1-b22d-3ba00801292a"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="7">418025.026 - 5715754.16 417982.794 5715750.487 417955.802 5715748.144 - 417955.467 5715742.959 417983.489 5715746.56 418025.436 - 5715751.952 418025.026 5715754.16 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:weitereZweckbestimmung1>1000</xplan:weitereZweckbestimmung1> - <xplan:nutzungsform>2000</xplan:nutzungsform> - </xplan:BP_GruenFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_GruenFlaeche gml:id="FEATURE_cf12e151-209f-4449-81c9-17d2e1da0aca"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_d0bca980-2523-48f4-888d-87f5f2a6bd75"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_76c4c6e6-a910-4d1b-8868-f1811b6a33d9"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="14">417974.749 - 5715812.843 417966.136 5715797.02 417965.68 5715796.354 - 417986.684 5715798.28 418008.123 5715800.245 417991.265 - 5715819.628 417989.583 5715821.329 417987.645 5715822.266 - 417986.042 5715822.609 417983.762 5715822.443 417982.155 - 5715822.106 417980.801 5715821.43 417979.783 5715820.497 - 417974.749 5715812.843 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:nutzungsform>2000</xplan:nutzungsform> - </xplan:BP_GruenFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_GruenFlaeche gml:id="FEATURE_d60e88e6-05d5-4d0c-b644-a18b912dd003"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_abd2dac5-aac3-4461-8481-d6cca9be5884"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_30b4d566-d63c-475e-8e3a-87f914469e99"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="25">417972.805 - 5715855.188 417968.636 5715853.612 417972.366 5715848.477 - 417976.724 5715845.312 417978.987 5715842.966 417981.042 - 5715840.899 417983.205 5715839.522 417986.555 5715838.824 - 417990.338 5715839.485 417993.451 5715840.15 417998.506 - 5715841.659 418002.639 5715843.343 418006.554 5715844.348 - 418007.184 5715845.112 418008.717 5715847.142 418009.141 - 5715849.089 418008.889 5715851.291 418007.951 5715853.579 - 418006.191 5715855.444 418003.744 5715856.972 418000.453 - 5715856.81 417997.855 5715852.972 417983.624 5715853.146 - 417983.443 5715855.224 417972.805 5715855.188 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:zweckbestimmung>9999</xplan:zweckbestimmung> - <xplan:nutzungsform>2000</xplan:nutzungsform> - </xplan:BP_GruenFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_GruenFlaeche gml:id="FEATURE_e56bd634-c7ab-4b13-b355-9ef3eda0ac62"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_a17e14cf-e6db-475e-9114-391562a2f07b"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_06e4f519-6603-4754-aa05-1693f26071ba"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="18">418001.399 - 5715915.393 418000.013 5715909.874 418001.213 5715910.293 - 418036.96 5715922.782 418041.609 5715924.4 418071.203 - 5715942.664 418052.049 5715943.912 418000.967 5715947.241 - 418000.433 5715948.123 418001.253 5715967.183 417992.271 - 5715961.587 417965.833 5715945.116 417931.624 5715923.804 - 417937.483 5715912.729 417938.213 5715911.35 417943.614 - 5715901.138 417947.953 5715892.932 418001.399 5715915.393 - </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:zweckbestimmung>9999</xplan:zweckbestimmung> - <xplan:nutzungsform>2000</xplan:nutzungsform> - </xplan:BP_GruenFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_GruenFlaeche gml:id="FEATURE_ff2cc402-89f7-4a77-86c3-d9f824d9c0a8"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_24480ced-2df6-4ccd-8be0-c1d79d4c7f10"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_313c6b30-0361-4a2f-a388-dbf02078d6a3"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="39">418357.389 - 5715966.799 418362.784 5715967.402 418436.736 5715962.632 - 418434.923 5715934.7 418443.1 5715947.02 418472.164 - 5715957.331 418440.325 5715983.774 418418.477 5716000.865 - 418388.345 5716022.295 418374.8 5716032.225 418370.339 - 5716031.093 418360.821 5716028.679 418340.836 5716023.61 - 418330.326 5716020.945 418321.922 5716018.813 418313.059 - 5716016.565 418282.381 5716008.785 418198.296 5715987.458 - 418157.999 5715977.238 418164.124 5715951.571 418167.411 - 5715937.74 418195.053 5715945.107 418212.915 5715949.867 - 418217.606 5715929.984 418227.602 5715932.757 418239.083 - 5715935.941 418255.102 5715940.384 418277.42 5715946.54 - 418272.221 5715968.133 418295.592 5715973.344 418293.774 - 5715980.457 418291.062 5715991.077 418306.819 5715995.165 - 418318.296 5715998.142 418328.931 5715960.733 418341.422 - 5715964.336 418343.534 5715964.944 418345.265 5715965.443 - 418357.389 5715966.799 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - </xplan:BP_GruenFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_NutzungsartenGrenze - gml:id="FEATURE_f8168908-ee40-4c6a-94b8-c60e908c6e01"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_94b80d67-8907-46c0-8dea-3391c9b3cf83"> - <gml:posList srsDimension="2" count="3">418047.038 - 5715850.181 418057.084 5715811.512 418066.113 5715776.541 - </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_NutzungsartenGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_NutzungsartenGrenze - gml:id="FEATURE_ff7ddb8b-f7e7-433d-b3ce-a3898b614669"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_4b4d3944-ca2d-4a4c-b402-7bd5666b7f1c"> - <gml:posList srsDimension="2" count="2">418085.051 - 5715897.931 418036.566 5715872.962 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_NutzungsartenGrenze> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_Plan gml:id="FEATURE_2dabcaaf-f831-4d73-b9bb-04b78f52ed54"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:name>"Heideweg"</xplan:name> - <xplan:nummer>Nr.1</xplan:nummer> - <xplan:technHerstellDatum>2001-08-27</xplan:technHerstellDatum> - <xplan:erstellungsMassstab>1000</xplan:erstellungsMassstab> - <xplan:xPlanGMLVersion>4.0</xplan:xPlanGMLVersion> - <xplan:raeumlicherGeltungsbereich> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_454464fe-7b68-49c3-b648-bf62e49f2843"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_02d4e636-4d91-47e7-8458-a6bed03e61dd"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="107">418355.941 - 5715848.133 418356.978 5715844.25 418364.584 5715813.894 - 418361.553 5715806.515 418384.129 5715709.723 418390.285 - 5715677.826 418430.4 5715687.627 418450.975 5715692.653 - 418460.249 5715694.026 418503.134 5715700.375 418496.968 - 5715724.624 418496.216 5715727.983 418487.652 5715735.774 - 418478.242 5715744.348 418469.148 5715752.631 418457.489 - 5715763.255 418447.696 5715772.183 418440.755 5715778.506 - 418431.606 5715786.842 418420.107 5715797.319 418414.567 - 5715811.579 418442.161 5715818.749 418470.2 5715826.034 - 418507.655 5715838.463 418493.482 5715888.664 418506.873 - 5715888.101 418508.013 5715898.578 418523.944 5715898.385 - 418523.778 5715913.592 418523.75 5715916.193 418522.52 - 5715918.071 418515.986 5715926.403 418513.199 5715929.655 - 418512.209 5715930.811 418498.02 5715947.369 418438.52 - 5715990.115 418416.866 5716005.666 418410.434 5716010.358 - 418378.954 5716033.278 418374.8 5716032.225 418370.339 - 5716031.093 418360.821 5716028.679 418340.836 5716023.61 - 418330.326 5716020.945 418321.922 5716018.813 418313.059 - 5716016.565 418282.381 5716008.785 418198.296 5715987.458 - 418157.999 5715977.238 418117.296 5715966.914 418105.754 - 5715963.987 418101.213 5715961.185 418081.185 5715948.824 - 418071.203 5715942.664 418052.049 5715943.912 418000.967 - 5715947.241 418000.433 5715948.123 418001.253 5715967.183 - 417992.271 5715961.587 417965.833 5715945.116 417931.624 - 5715923.804 417922.86 5715918.344 417929.061 5715906.241 - 417933.021 5715898.942 417935.068 5715895.206 417936.815 - 5715892.017 417937.932 5715889.889 417938.631 5715888.553 - 417939.602 5715886.696 417942.154 5715881.873 417964.77 - 5715839.128 417969.442 5715828.12 417968.157 5715821.377 - 417966.252 5715815.686 417963.973 5715808.906 417958.847 - 5715798.597 417947.867 5715782.944 417924.514 5715744.942 - 417921.386 5715738.578 417928.549 5715739.499 417955.467 - 5715742.959 417983.489 5715746.56 418025.436 5715751.952 - 418025.026 5715754.16 418023.457 5715762.607 418021.972 - 5715770.617 418018.864 5715787.393 418024.937 5715793.183 - 418048.723 5715772.8 418054.711 5715767.676 418064.177 - 5715760.796 418077.98 5715749.572 418084.362 5715745.492 - 418112.546 5715723.69 418127.141 5715712.402 418134.066 - 5715702.197 418145.135 5715685.478 418194.463 5715710.782 - 418155.678 5715780.293 418151.761 5715787.185 418151.714 - 5715787.268 418143.976 5715793.344 418136.707 5715824.698 - 418324.171 5715864.492 418350.514 5715870.045 418353.09 - 5715859.766 418355.941 5715848.133 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:raeumlicherGeltungsbereich> - <xplan:refLegende> - <xplan:XP_ExterneReferenz> - <xplan:referenzName>B-Plan_Klingmuehl_Heideweg_Leg - </xplan:referenzName> - <xplan:referenzURL>B-Plan_Klingmuehl_Heideweg_Leg.pdf - </xplan:referenzURL> - </xplan:XP_ExterneReferenz> - </xplan:refLegende> - <xplan:refRechtsplan> - <xplan:XP_ExterneReferenz> - <xplan:art>PlanMitGeoreferenz</xplan:art> - <xplan:referenzName>B-Plan_Klingmuehl_Heideweg</xplan:referenzName> - <xplan:referenzURL>B-Plan_Klingmuehl_Heideweg.tif - </xplan:referenzURL> - </xplan:XP_ExterneReferenz> - </xplan:refRechtsplan> - <xplan:texte xlink:href="#FEATURE_0f870967-bd6f-4367-9150-8a255f0290ad" /> - <xplan:gemeinde> - <xplan:XP_Gemeinde> - <xplan:ags>12062425</xplan:ags> - <xplan:gemeindeName>Gemeinde Sallgast vertreten durch "Amt Kleine - Elster"</xplan:gemeindeName> - <xplan:ortsteilName>Klingmuehl</xplan:ortsteilName> - </xplan:XP_Gemeinde> - </xplan:gemeinde> - <xplan:planArt>1000</xplan:planArt> - <xplan:rechtsstand>4000</xplan:rechtsstand> - <xplan:hoehenbezug>HN</xplan:hoehenbezug> - <xplan:inkrafttretensDatum>2002-02-01</xplan:inkrafttretensDatum> - <xplan:bereich xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - </xplan:BP_Plan> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_SchutzPflegeEntwicklungsFlaeche - gml:id="FEATURE_06264d65-cb1a-4540-81fa-1836840c9740"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_aa673309-902b-43cf-b600-8cfaf2446177"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_6105586e-e4e4-4d43-a3ca-c5440e61255b"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="20">418198.296 - 5715987.458 418157.999 5715977.238 418164.124 5715951.571 - 418167.411 5715937.74 418195.053 5715945.107 418212.915 - 5715949.867 418217.606 5715929.984 418227.602 5715932.757 - 418239.083 5715935.941 418255.102 5715940.384 418277.42 - 5715946.54 418272.221 5715968.133 418295.592 5715973.344 - 418293.774 5715980.457 418291.062 5715991.077 418306.819 - 5715995.165 418318.296 5715998.142 418313.059 5716016.565 - 418282.381 5716008.785 418198.296 5715987.458 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:ziel>1000</xplan:ziel> - <xplan:massnahme> - <xplan:XP_SPEMassnahmenDaten> - <xplan:klassifizMassnahme>2200</xplan:klassifizMassnahme> - </xplan:XP_SPEMassnahmenDaten> - </xplan:massnahme> - </xplan:BP_SchutzPflegeEntwicklungsFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_SchutzPflegeEntwicklungsFlaeche - gml:id="FEATURE_42b5abcc-9f76-4631-a234-f3e3251b2f8e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_0613d59e-f57d-4368-b457-7927f857194b"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_9000ddd4-6c20-45b0-b493-b236fb55a130"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="16">418460.249 - 5715694.026 418503.134 5715700.375 418496.968 5715724.624 - 418496.216 5715727.983 418487.652 5715735.774 418478.242 - 5715744.348 418469.148 5715752.631 418457.489 5715763.255 - 418447.696 5715772.183 418440.755 5715778.506 418420.107 - 5715797.319 418421.955 5715792.547 418434.407 5715760.511 - 418440.038 5715746.034 418454.526 5715708.75 418460.249 - 5715694.026 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:ziel>1000</xplan:ziel> - <xplan:massnahme> - <xplan:XP_SPEMassnahmenDaten> - <xplan:klassifizMassnahme>9999</xplan:klassifizMassnahme> - <xplan:massnahmeText>biotopvernetzte Elemente sichern - </xplan:massnahmeText> - </xplan:XP_SPEMassnahmenDaten> - </xplan:massnahme> - </xplan:BP_SchutzPflegeEntwicklungsFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_SchutzPflegeEntwicklungsFlaeche - gml:id="FEATURE_9de8c349-ad84-4543-b028-0017481ab9c7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_efe2f31f-1e24-4428-84f8-8b2d788400d5"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_5c2b74a7-2205-47e3-9dfb-46ef7541f761"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="8">418110.407 - 5715826.26 418119.974 5715788.13 418143.976 5715793.344 - 418136.707 5715824.698 418135.479 5715829.995 418131.895 - 5715845.475 418107.058 5715839.617 418110.407 5715826.26 - </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:ziel>1000</xplan:ziel> - <xplan:massnahme> - <xplan:XP_SPEMassnahmenDaten> - <xplan:klassifizMassnahme>9999</xplan:klassifizMassnahme> - <xplan:massnahmeText>Altobstbestand ist zu erhalten und zu - ergaenzen gemaess Liste</xplan:massnahmeText> - </xplan:XP_SPEMassnahmenDaten> - </xplan:massnahme> - </xplan:BP_SchutzPflegeEntwicklungsFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_SchutzPflegeEntwicklungsFlaeche - gml:id="FEATURE_c0877d2b-3407-4efe-9e31-54472f047409"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_246ac72c-aa78-40b3-b3ca-0b93eb833c49"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_40680c64-0f6c-4a88-83be-352255ccb3db"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="15">418370.339 - 5716031.093 418360.821 5716028.679 418340.836 5716023.61 - 418362.784 5715967.402 418436.736 5715962.632 418434.923 - 5715934.7 418479.455 5715931.83 418480.992 5715943.443 - 418481.774 5715949.35 418472.164 5715957.331 418440.325 - 5715983.774 418418.477 5716000.865 418388.345 5716022.295 - 418374.8 5716032.225 418370.339 5716031.093 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:ziel>1000</xplan:ziel> - <xplan:massnahme> - <xplan:XP_SPEMassnahmenDaten> - <xplan:klassifizMassnahme>9999</xplan:klassifizMassnahme> - <xplan:massnahmeText>biotopvernetzte Elemente sichern - </xplan:massnahmeText> - </xplan:XP_SPEMassnahmenDaten> - </xplan:massnahme> - </xplan:BP_SchutzPflegeEntwicklungsFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_SchutzPflegeEntwicklungsFlaeche - gml:id="FEATURE_d236d1a5-b387-4419-94c8-4211b5fd1d17"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_aad1c50f-9185-47e6-91bf-2be4062b4445"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_e586c27a-a23f-453a-9cca-7bc69b9bad24"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="12">418357.389 - 5715966.799 418362.784 5715967.402 418340.836 5716023.61 - 418330.326 5716020.945 418321.922 5716018.813 418313.059 - 5716016.565 418318.296 5715998.142 418328.931 5715960.733 - 418341.422 5715964.336 418343.534 5715964.944 418345.265 - 5715965.443 418357.389 5715966.799 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:ziel>1000</xplan:ziel> - <xplan:massnahme> - <xplan:XP_SPEMassnahmenDaten> - <xplan:klassifizMassnahme>9999</xplan:klassifizMassnahme> - <xplan:massnahmeText>Altobstbestand ist zu erhalten und zu - ergaenzen gemaess Liste</xplan:massnahmeText> - </xplan:XP_SPEMassnahmenDaten> - </xplan:massnahme> - </xplan:BP_SchutzPflegeEntwicklungsFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_SchutzPflegeEntwicklungsFlaeche - gml:id="FEATURE_dbaa6ed4-601c-4070-9e92-1776e5857a09"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_71e1e215-8da8-4dda-9c23-0cf584341a03"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_5112f88f-8fc2-4458-b465-6d20c20950d8"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="8">418442.161 - 5715818.749 418470.2 5715826.034 418507.655 5715838.463 - 418493.482 5715888.664 418492.745 5715891.277 418426.509 - 5715874.521 418427.153 5715872.225 418442.161 5715818.749 - </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:ziel>1000</xplan:ziel> - <xplan:massnahme> - <xplan:XP_SPEMassnahmenDaten> - <xplan:klassifizMassnahme>9999</xplan:klassifizMassnahme> - <xplan:massnahmeText>Altobstbestand ist zu erhalten und zu - ergaenzen gemaess Liste</xplan:massnahmeText> - </xplan:XP_SPEMassnahmenDaten> - </xplan:massnahme> - </xplan:BP_SchutzPflegeEntwicklungsFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_StrassenVerkehrsFlaeche - gml:id="FEATURE_6e71a8d6-7fab-4996-8874-0dd1ad7d9202"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_96da8b80-1afd-41b4-a0ef-661c9380551e"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_8e9e00ce-5dfa-4935-8135-e3569c173f85"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="17">418420.107 - 5715797.319 418414.567 5715811.579 418411.41 5715811.725 - 418389.134 5715812.759 418387.046 5715812.855 418364.584 - 5715813.894 418361.553 5715806.515 418407.803 5715804.366 - 418440.047 5715720.93 418430.4 5715687.627 418450.975 - 5715692.653 418460.249 5715694.026 418454.526 5715708.75 - 418440.038 5715746.034 418434.407 5715760.511 418421.955 - 5715792.547 418420.107 5715797.319 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:nutzungsform>2000</xplan:nutzungsform> - </xplan:BP_StrassenVerkehrsFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_StrassenVerkehrsFlaeche - gml:id="FEATURE_95e60410-12a8-43eb-a1af-e0a01148232e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_d7157d42-f501-4403-867b-d836688de9e7"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_7db16188-5360-429e-82df-9c8425df5a9e"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="16">417950.565 - 5715887.711 417947.953 5715892.932 417943.614 5715901.138 - 417938.213 5715911.35 417937.483 5715912.729 417931.624 - 5715923.804 417922.86 5715918.344 417929.061 5715906.241 - 417933.021 5715898.942 417935.068 5715895.206 417936.815 - 5715892.017 417937.932 5715889.889 417938.631 5715888.553 - 417939.602 5715886.696 417942.154 5715881.873 417950.565 - 5715887.711 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:nutzungsform>2000</xplan:nutzungsform> - </xplan:BP_StrassenVerkehrsFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_StrassenVerkehrsFlaeche - gml:id="FEATURE_c0a46d54-2873-4f58-a7bc-adb17c9e1c34"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_e97fb5be-c0ff-4796-9c75-3531fff5f5ea"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_5cdbb1bc-0d2d-4e19-a819-c5185b815fc7"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="108">417969.442 - 5715828.12 417968.157 5715821.377 417966.252 5715815.686 - 417963.973 5715808.906 417958.847 5715798.597 417947.867 - 5715782.944 417924.514 5715744.942 417921.386 5715738.578 - 417928.549 5715739.499 417932.234 5715746.146 417936.56 - 5715752.908 417942.604 5715762.362 417943.873 5715764.124 - 417948.416 5715770.41 417958.158 5715785.776 417965.68 - 5715796.354 417966.136 5715797.02 417974.749 5715812.843 - 417979.783 5715820.497 417980.801 5715821.43 417982.155 - 5715822.106 417983.762 5715822.443 417986.042 5715822.609 - 417987.645 5715822.266 417989.583 5715821.329 417991.265 - 5715819.628 418008.123 5715800.245 418018.864 5715787.393 - 418024.937 5715793.183 418048.723 5715772.8 418054.711 - 5715767.676 418064.177 5715760.796 418063.837 5715761.788 - 418062.152 5715766.704 418064.499 5715769.676 418151.714 - 5715787.268 418143.976 5715793.344 418119.974 5715788.13 - 418095.703 5715782.891 418066.113 5715776.541 418051.184 - 5715773.327 418008.621 5715813.543 418000.502 5715822.288 - 417996.657 5715826.888 417998.327 5715833.253 418035.952 - 5715847.271 418047.038 5715850.181 418076.084 5715857.789 - 418100.888 5715864.226 418126.161 5715870.242 418147.594 - 5715875.316 418152.577 5715876.511 418171.876 5715881.134 - 418189.399 5715885.378 418210.296 5715890.28 418231.022 - 5715895.165 418258.215 5715901.702 418286.464 5715908.418 - 418312.125 5715914.431 418334.365 5715919.611 418338.021 - 5715920.469 418358.465 5715925.247 418370.165 5715927.982 - 418380.843 5715927.364 418383.997 5715927.181 418408.295 - 5715925.602 418444.78 5715923.157 418484.48 5715920.543 - 418516.833 5715918.441 418522.52 5715918.071 418515.986 - 5715926.403 418513.199 5715929.655 418499.501 5715930.538 - 418479.455 5715931.83 418434.923 5715934.7 418405.659 - 5715936.586 418386.704 5715937.809 418369.307 5715938.932 - 418353.82 5715935.258 418330.478 5715929.721 418307.873 - 5715924.358 418284.134 5715918.687 418262.336 5715913.484 - 418233.194 5715906.566 418223.719 5715904.316 418207.547 - 5715900.452 418177.95 5715893.431 418168.911 5715891.258 - 418145.03 5715885.518 418146.378 5715882.834 418099.168 - 5715871.623 418041.793 5715856.568 418037.489 5715870.098 - 418036.566 5715872.962 418035.417 5715876.486 418029.037 - 5715874.61 418030.052 5715867.071 418034.1 5715854.607 - 418031.378 5715853.914 418022.156 5715850.36 418006.554 - 5715844.348 418002.639 5715843.343 417998.506 5715841.659 - 417993.451 5715840.15 417990.338 5715839.485 417986.555 - 5715838.824 417983.205 5715839.522 417969.442 5715828.12 - </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:nutzungsform>2000</xplan:nutzungsform> - </xplan:BP_StrassenVerkehrsFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_StrassenVerkehrsFlaeche - gml:id="FEATURE_cf5a4332-942c-4aa5-ac3b-c3f48fac1d9a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_ab918966-0710-49b4-b34d-4c7f71568ba7"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_2035d0fb-03f1-42e0-80d6-6c22a99e6c44"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="35">417969.442 - 5715828.12 417983.205 5715839.522 417981.042 5715840.899 - 417978.987 5715842.966 417976.724 5715845.312 417972.366 - 5715848.477 417968.636 5715853.612 417972.805 5715855.188 - 417983.443 5715855.224 417983.624 5715853.146 417997.855 - 5715852.972 418000.453 5715856.81 418003.744 5715856.972 - 418006.191 5715855.444 418007.951 5715853.579 418008.889 - 5715851.291 418009.141 5715849.089 418008.717 5715847.142 - 418007.184 5715845.112 418006.554 5715844.348 418022.156 - 5715850.36 418020.542 5715854.836 418019.615 5715857.208 - 418018.349 5715859.495 418016.07 5715862.291 418013.705 - 5715864.495 418009.989 5715866.869 418006.61 5715868.311 - 418002.387 5715868.994 417960.41 5715869.434 417957.658 - 5715873.534 417950.565 5715887.711 417942.154 5715881.873 - 417964.77 5715839.128 417969.442 5715828.12 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - <xplan:nutzungsform>2000</xplan:nutzungsform> - </xplan:BP_StrassenVerkehrsFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_StrassenbegrenzungsLinie - gml:id="FEATURE_25f1af5b-7c1c-457a-aaa5-6016667b177b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_c2eadf22-19ad-4dc9-9b0c-66789e5e4c93"> - <gml:posList srsDimension="2" count="59">418002.639 - 5715843.343 418006.554 5715844.348 418022.156 5715850.36 - 418031.378 5715853.914 418034.1 5715854.607 418030.052 5715867.071 - 418029.037 5715874.61 418035.417 5715876.486 418036.566 - 5715872.962 418037.489 5715870.098 418041.793 5715856.568 - 418099.168 5715871.623 418146.378 5715882.834 418145.03 - 5715885.518 418168.911 5715891.258 418177.95 5715893.431 - 418207.547 5715900.452 418223.719 5715904.316 418233.194 - 5715906.566 418262.336 5715913.484 418284.134 5715918.687 - 418307.873 5715924.358 418330.478 5715929.721 418353.82 - 5715935.258 418369.307 5715938.932 418386.704 5715937.809 - 418405.659 5715936.586 418434.923 5715934.7 418479.455 5715931.83 - 418499.501 5715930.538 418513.199 5715929.655 418515.986 - 5715926.403 418522.52 5715918.071 418516.833 5715918.441 418484.48 - 5715920.543 418444.78 5715923.157 418408.295 5715925.602 - 418383.997 5715927.181 418380.843 5715927.364 418370.165 - 5715927.982 418358.465 5715925.247 418338.021 5715920.469 - 418334.365 5715919.611 418312.125 5715914.431 418286.464 - 5715908.418 418258.215 5715901.702 418231.022 5715895.165 - 418210.296 5715890.28 418189.399 5715885.378 418171.876 - 5715881.134 418152.577 5715876.511 418147.594 5715875.316 - 418126.161 5715870.242 418100.888 5715864.226 418076.084 - 5715857.789 418047.038 5715850.181 418035.952 5715847.271 - 417998.327 5715833.253 417996.657 5715826.888 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_StrassenbegrenzungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_StrassenbegrenzungsLinie - gml:id="FEATURE_610e51bd-770e-427e-9f8e-15525a58668b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_65f110e4-d326-4ca9-b752-59e87ec066fd"> - <gml:posList srsDimension="2" count="35">417921.386 - 5715738.578 417924.514 5715744.942 417947.867 5715782.944 - 417958.847 5715798.597 417963.973 5715808.906 417966.252 - 5715815.686 417968.157 5715821.377 417969.442 5715828.12 417964.77 - 5715839.128 417942.154 5715881.873 417939.602 5715886.696 - 417938.631 5715888.553 417937.932 5715889.889 417936.815 - 5715892.017 417935.068 5715895.206 417933.021 5715898.942 - 417929.061 5715906.241 417922.86 5715918.344 417931.624 - 5715923.804 417937.483 5715912.729 417938.213 5715911.35 - 417943.614 5715901.138 417947.953 5715892.932 417950.565 - 5715887.711 417957.658 5715873.534 417960.41 5715869.434 - 418002.387 5715868.994 418006.61 5715868.311 418009.989 - 5715866.869 418013.705 5715864.495 418016.07 5715862.291 - 418018.349 5715859.495 418019.615 5715857.208 418020.542 - 5715854.836 418022.156 5715850.36 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_StrassenbegrenzungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_StrassenbegrenzungsLinie - gml:id="FEATURE_95ea436a-66a2-402d-b88a-ede3de3ab7f9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_93c1bcf5-7b91-44c9-b058-efa369262142"> - <gml:posList srsDimension="2" count="24">418006.554 - 5715844.348 418007.184 5715845.112 418008.717 5715847.142 - 418009.141 5715849.089 418008.889 5715851.291 418007.951 - 5715853.579 418006.191 5715855.444 418003.744 5715856.972 - 418000.453 5715856.81 417997.855 5715852.972 417983.624 - 5715853.146 417983.443 5715855.224 417972.805 5715855.188 - 417968.636 5715853.612 417972.366 5715848.477 417976.724 - 5715845.312 417978.987 5715842.966 417981.042 5715840.899 - 417983.205 5715839.522 417986.555 5715838.824 417990.338 - 5715839.485 417993.451 5715840.15 417998.506 5715841.659 - 418002.639 5715843.343 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_StrassenbegrenzungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_StrassenbegrenzungsLinie - gml:id="FEATURE_a0b1e82e-a529-47e9-a8f0-71305b614ef3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_33f4be0c-5d83-45a9-a8be-fbf5a90465f1"> - <gml:posList srsDimension="2" count="2">418143.976 - 5715793.344 418151.714 5715787.268 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_StrassenbegrenzungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_StrassenbegrenzungsLinie - gml:id="FEATURE_ba48dcf8-042f-4c38-bb74-10895cd736d3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_ec588dce-694f-4977-959c-623f02032505"> - <gml:posList srsDimension="2" count="2">417928.549 - 5715739.499 417921.386 5715738.578 </gml:posList> - </gml:LineString> - </xplan:position> - </xplan:BP_StrassenbegrenzungsLinie> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_1b9097ed-8dca-4499-a916-95f5ece2dd96"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_e7a84b84-c858-46c0-a148-8ad8570de499"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_39577b90-ded3-46f1-8d96-dcea70185586"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="5">417963.591 - 5715761.143 417947.87 5715760.18 417948.45 5715749.36 - 417964.171 5715750.323 417963.591 5715761.143 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_1eeba484-761b-40bb-9110-be43ff30db8c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_024d30df-0e45-48fe-ae8c-47a1b6ca6fb8"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_32faa594-0dae-4f0a-b8fa-329aaa0a8bba"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="6">417964.701 - 5715897.522 417952.693 5715889.188 417958.601 5715877.336 - 417978.909 5715887.459 417972.528 5715900.26 417964.701 - 5715897.522 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_3f4bea27-a89d-478c-af39-5e3a5b36ad73"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_36dbbb62-5b37-42f2-9ff4-a3517b929660"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_30e28437-966c-428c-88ef-dfc8ea99c52c"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="5">418118.847 - 5715881.176 418115.141 5715895.704 418096.492 5715890.947 - 418100.199 5715876.418 418118.847 5715881.176 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_4c2a3e37-aa73-4f5b-96c5-3e7183c23c7f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_dc281f11-1892-42d8-8d00-c8b511c6b998"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_e6b395f4-1723-430c-953c-1f2db4e6c109"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="5">418415.467 - 5715722.816 418411.539 5715747.667 418396.729 5715745.327 - 418400.657 5715720.475 418415.467 5715722.816 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_5adbc6a9-70f0-4227-b356-ea11793aa292"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_3b30c3a4-d799-45fc-b1a2-96ba994ae8b5"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_c36d5859-c321-4f78-b248-382c0f998cbf"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="12">418075.827 - 5715868.082 418071.404 5715884.941 418061.595 5715882.597 - 418059.625 5715881.618 418051.185 5715877.431 418049.792 - 5715876.742 418040.336 5715871.636 418041.271 5715868.804 - 418039.981 5715867.826 418043.69 5715862.07 418044.284 - 5715859.805 418075.827 5715868.082 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_5d463a3c-ac4c-45a3-ba49-cb2e18b14f24"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_cb425223-5dbe-402c-9ae4-6159eab799df"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_0a86b81c-fc9c-4864-a982-f5522a647a3d"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="7">418027.639 - 5715824.992 418022.485 5715839.054 418004.387 5715832.311 - 418004.743 5715830.88 418006.744 5715822.839 418010.814 - 5715818.831 418027.639 5715824.992 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_69004834-95cc-4575-a5d1-b55ff65e7a6a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_a4089230-92e4-4cfd-8ff6-957f8bb34d0f"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_71f8a563-07ce-4165-b8ab-8b693b968e6c"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="6">418355.941 - 5715848.133 418356.978 5715844.25 418376.362 5715849.423 - 418372.239 5715864.876 418353.09 5715859.766 418355.941 - 5715848.133 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_8e93564f-04d8-48ce-8bac-dc9f055f4876"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_6d041f51-7164-48ce-a337-ef862c6c4db5"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_0149b07c-a276-47db-9ce9-1aba9e99de83"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="13">418129.71 - 5715754.156 418135.651 5715744.747 418144.291 5715750.073 - 418136.004 5715763.049 418134.12 5715762.102 418126.32 - 5715774.26 418120.424 5715770.214 418117.217 5715773.122 - 418115.825 5715779.5 418084.29 5715773.12 418074.558 - 5715757.175 418105.344 5715736.379 418129.71 5715754.156 - </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_ad908b4d-8429-469c-991c-7f6a67296c70"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_dae7f570-5922-455f-8b41-50d5a7ad1d66"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_fb746b9a-d88d-4e73-8fef-a0f293c4646d"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="19">418386.151 - 5715922.941 418390.025 5715908.286 418397.975 5715909.398 - 418401.651 5715909.147 418411.718 5715908.46 418411.495 - 5715905.351 418420.945 5715904.719 418426.414 5715904.353 - 418443.454 5715903.209 418483.175 5715900.594 418504.408 - 5715899.214 418505.38 5715914.176 418484.154 5715915.556 - 418444.448 5715918.17 418427.417 5715919.313 418421.946 - 5715919.679 418422.13 5715922.161 418400.273 5715923.779 - 418386.151 5715922.941 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_b07f7df6-a860-4e5c-a587-c732bd0b862c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_9ab7420e-103d-4dff-9d40-b8be59291d6c"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_2d30a583-f330-4753-ae8b-7af380f2f7c4"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="15">418139.76 - 5715902.757 418146.646 5715888.991 418168.21 5715894.174 - 418177.253 5715896.348 418206.852 5715903.369 418223.024 - 5715907.233 418232.501 5715909.484 418258.638 5715915.688 - 418254.742 5715930.174 418229.038 5715924.072 418219.55 - 5715921.819 418203.38 5715917.956 418173.771 5715910.932 - 418164.706 5715908.752 418139.76 5715902.757 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_d4266308-5fd9-4919-a7b8-d728c5add1ef"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_0dee6039-87ba-4699-b83f-b5f94fba5c5f"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_215ad81e-1461-4450-8b24-b30054644c5d"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="38">418149.16 - 5715856.161 418152.017 5715856.846 418157.004 5715858.042 - 418176.324 5715862.67 418193.803 5715866.903 418214.643 - 5715871.792 418235.42 5715876.689 418262.631 5715883.23 - 418290.827 5715889.933 418316.446 5715895.937 418338.689 - 5715901.117 418342.352 5715901.977 418361.541 5715906.462 - 418384.967 5715907.851 418381.058 5715922.639 418359.375 - 5715921.354 418338.933 5715916.576 418335.275 5715915.718 - 418313.035 5715910.537 418287.383 5715904.527 418259.145 - 5715897.813 418231.948 5715891.275 418211.211 5715886.388 - 418190.326 5715881.489 418172.812 5715877.247 418153.509 - 5715872.623 418148.521 5715871.426 418127.085 5715866.352 - 418101.853 5715860.346 418051.75 5715848.23 418055.274 - 5715833.656 418105.351 5715845.765 418130.557 5715851.765 - 418139.052 5715853.787 418139.38 5715852.446 418143.309 - 5715853.394 418149.467 5715854.88 418149.16 5715856.161 - </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_f1d8fb7a-e823-4324-860a-3a306c2f56aa"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_19770f8c-3f00-4f9a-aac1-004320885f14"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_2cb49988-fbdf-47c1-88ae-4c4d203f3e77"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="9">418344.804 - 5715951.611 418326.325 5715947.228 418303.706 5715941.862 - 418282.87 5715936.884 418286.354 5715922.301 418307.178 - 5715927.275 418329.786 5715932.639 418348.265 5715937.022 - 418344.804 5715951.611 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_f2684dfc-07d2-4582-80f5-39db3e841c24"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_a3ba7b28-7424-44cd-b685-141c0f34fbc0"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_ccdc807f-8161-480e-af6c-81d08fb9578a"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="9">418423.293 - 5715953.48 418406.817 5715954.542 418387.863 5715955.764 - 418373.362 5715956.7 418372.397 5715941.737 418386.897 - 5715940.802 418405.852 5715939.579 418422.329 5715938.517 - 418423.293 5715953.48 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_f2c01fca-d25a-4cee-987e-5c98774820e4"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_a8597230-f905-48c8-ac7d-cae4925f8e21"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_45fb759f-5596-4445-a5b2-adfb13a98a6d"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="6">418058.02 - 5715925.94 418045.187 5715921.766 418052.687 5715898.706 - 418066.946 5715903.344 418059.446 5715926.404 418058.02 - 5715925.94 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_UeberbaubareGrundstuecksFlaeche - gml:id="FEATURE_fde3f40d-b7a6-479a-9469-3d736e3b86d6"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_625b1a47-45d8-4ac5-9090-1d95c5a342e2"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_35aaf38c-20d8-4776-9979-3669eb894cfd"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="5">417968.46 - 5715790.369 417970 5715775.454 418010.039 5715779.341 - 418008.67 5715794.272 417968.46 5715790.369 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - </xplan:BP_UeberbaubareGrundstuecksFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_VerEntsorgung gml:id="FEATURE_10c8146b-3a7b-413d-b636-ce2b91dc1d14"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c54f89c7-c4a1-4fb4-8af7-7572561b5cd2"> - <gml:pos>418269.885 5715934.976</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:zweckbestimmung>2000</xplan:zweckbestimmung> - <xplan:textlicheErgaenzung>Zisterne</xplan:textlicheErgaenzung> - </xplan:BP_VerEntsorgung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_VerEntsorgung gml:id="FEATURE_1e17b22e-b2a2-41c8-b1dc-26734059574c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_c4210df8-103a-40d2-b143-8def785d28f6"> - <gml:posList srsDimension="2" count="7">417938.631 - 5715888.553 417961.263 5715904.262 417990.413 5715914.461 - 418034.491 5715929.86 418084.733 5715947.355 418155.207 - 5715972.462 418198.296 5715987.458 </gml:posList> - </gml:LineString> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:zweckbestimmung>1000</xplan:zweckbestimmung> - <xplan:weitereZweckbestimmung1>1000</xplan:weitereZweckbestimmung1> - <xplan:textlicheErgaenzung>20KV Freileitung - </xplan:textlicheErgaenzung> - </xplan:BP_VerEntsorgung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_VerEntsorgung gml:id="FEATURE_22343ddf-8132-4f23-8e70-08135868babe"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_f854ffed-f2bf-4525-a1c0-dc6646debb85"> - <gml:pos>418351.843 5715957.355</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:weitereZweckbestimmung1>2400</xplan:weitereZweckbestimmung1> - </xplan:BP_VerEntsorgung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_VerEntsorgung gml:id="FEATURE_369513aa-097e-44dc-9735-035902511fe6"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:LineString gml:id="GEOMETRY_e0920483-fbd8-4a08-8cf9-d907e796e965"> - <gml:posList srsDimension="2" count="5">418512.209 - 5715930.811 418498.42 5715940.435 418469.118 5715960.856 - 418418.452 5715996.729 418370.339 5716031.093 </gml:posList> - </gml:LineString> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:weitereZweckbestimmung1>1000</xplan:weitereZweckbestimmung1> - <xplan:textlicheErgaenzung>20 KV Freileitung - </xplan:textlicheErgaenzung> - </xplan:BP_VerEntsorgung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_VerEntsorgung gml:id="FEATURE_3d8cad97-e03c-44b8-8955-b0905177dcb4"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c343f02c-5d71-47ad-97d7-68b87e4c6198"> - <gml:pos>418352.444 5715941.727</gml:pos> - </gml:Point> - </xplan:position> - </xplan:BP_VerEntsorgung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_VerEntsorgung gml:id="FEATURE_787da1bf-5cc0-4f2f-87a9-73ba33508983"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_da833a68-f100-43d9-9775-0e1c04ba5c17"> - <gml:pos>418337.741 5715979.406</gml:pos> - </gml:Point> - </xplan:position> - </xplan:BP_VerEntsorgung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_VerEntsorgung gml:id="FEATURE_7896d13a-2b65-40a2-bc82-7e12710e81cc"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_48c0eba6-3f1d-4342-a0c1-167a1c0debe4"> - <gml:pos>417980.251 5715851.9</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:zweckbestimmung>2200</xplan:zweckbestimmung> - <xplan:textlicheErgaenzung>Wertstoffcontainer - </xplan:textlicheErgaenzung> - </xplan:BP_VerEntsorgung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_VerEntsorgung gml:id="FEATURE_978f9e2e-8b39-4366-8285-78d813426517"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_06a57e2a-d514-4c3e-a4f1-33eb4fd10471"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_7224f01c-96ab-435e-9943-a579a552b810"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="63">418357.389 - 5715966.799 418356.181 5715968.258 418353.813 5715970.666 - 418352.205 5715972.215 418349.16 5715974.501 418346.537 - 5715977.465 418344.846 5715980.09 418343.577 5715982.716 - 418342.817 5715985.85 418342.565 5715988.899 418342.651 - 5715990.593 418342.906 5715993.304 418343.247 5715997.455 - 418343.673 5716002.708 418343.127 5716004.318 418341.898 - 5716006.182 418340.193 5716008.736 418338.502 5716011.787 - 418336.388 5716014.962 418334.462 5716017.334 418331.989 - 5716019.686 418330.326 5716020.945 418321.922 5716018.813 - 418321.67 5716016.597 418322.092 5716013.717 418322.937 - 5716010.921 418324.036 5716008.635 418325.051 5716007.28 - 418328.435 5716003.977 418330.719 5716000.504 418332.325 - 5715996.608 418333.396 5715993.404 418333.903 5715990.95 - 418334.182 5715988.308 418335.375 5715984.402 418336.389 - 5715981.692 418337.741 5715979.406 418339.846 5715977.214 - 418343.059 5715971.371 418343.395 5715967.984 418343.534 - 5715964.944 418343.646 5715962.48 418345.167 5715959.178 - 418348.362 5715954.473 418350.239 5715949.78 418352.444 - 5715941.727 418354.378 5715937.758 418355.223 5715935.98 - 418356.831 5715934.795 418359.031 5715934.287 418363.728 - 5715934.541 418365.721 5715935.643 418366.822 5715937.167 - 418368.686 5715938.607 418369.619 5715940.723 418369.79 - 5715943.348 418369.287 5715944.699 418368.406 5715947.154 - 418366.245 5715951.726 418363.286 5715957.737 418361.341 - 5715961.293 418359.142 5715964.68 418357.389 5715966.799 - </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:zweckbestimmung>2400</xplan:zweckbestimmung> - </xplan:BP_VerEntsorgung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_VerEntsorgung gml:id="FEATURE_cc3d661e-1bb7-4af6-9cb4-865409e95171"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e335dcb7-7ad5-440b-85f2-c9aec93770f9"> - <gml:pos>418276.5 5715922.627</gml:pos> - </gml:Point> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:besondereZweckbestimmung>10001</xplan:besondereZweckbestimmung> - </xplan:BP_VerEntsorgung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_VerEntsorgung gml:id="FEATURE_f912cbec-fcbf-4dc8-a383-430ae3bb4793"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_0b95e5bd-376f-487f-827c-1e5d873c51a8"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_d7576777-f3ed-4262-9606-d24907c1f957"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="6">418262.336 - 5715913.484 418284.134 5715918.687 418281.449 5715929.824 - 418277.42 5715946.54 418255.102 5715940.384 418262.336 - 5715913.484 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - </xplan:BP_VerEntsorgung> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_WaldFlaeche gml:id="FEATURE_7bdfbfad-539e-4a92-ad79-ab71ac733ab6"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_641fbd45-660f-42c3-9e1e-c96632c52983"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_9e319347-d4f7-4793-8413-d2a4d7dadd19"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="5">418430.4 - 5715687.627 418440.047 5715720.93 418384.129 5715709.723 - 418390.285 5715677.826 418430.4 5715687.627 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - </xplan:BP_WaldFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_WaldFlaeche gml:id="FEATURE_8e5930c5-4390-4abb-9d97-00126eb3925d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_36dd3382-2106-480c-8101-245296ba09b1"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_feb0e7da-d9f8-4a7e-bba0-0dd9ebb49978"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="7">418480.992 - 5715943.443 418481.774 5715949.35 418472.164 5715957.331 - 418443.1 5715947.02 418434.923 5715934.7 418479.455 5715931.83 - 418480.992 5715943.443 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>true</xplan:flaechenschluss> - </xplan:BP_WaldFlaeche> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_Wegerecht gml:id="FEATURE_0e9ccd04-1890-409b-8c4f-5254fe84b3d5"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_604be9b7-310b-4811-8fe9-bead13cf7c0e"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_579effea-b323-400f-97bb-ca7a83abd8fe"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="5">418383.997 - 5715927.181 418380.843 5715927.364 418411.41 5715811.725 - 418414.567 5715811.579 418383.997 5715927.181 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:typ>4000</xplan:typ> - <xplan:zugunstenVon>Gemeinde, ENVIA, WAL, Telekom - </xplan:zugunstenVon> - </xplan:BP_Wegerecht> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_Wegerecht gml:id="FEATURE_89f8490d-8a72-4c72-b7f8-a3007e056e2f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_a411d46b-b808-4144-8d4b-684e7c553d36"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_96454243-48b2-40ae-b572-afb8f1211abd"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="20">418516.833 - 5715918.441 418523.778 5715913.592 418523.75 5715916.193 - 418522.52 5715918.071 418515.986 5715926.403 418513.199 - 5715929.655 418512.209 5715930.811 418498.02 5715947.369 - 418438.52 5715990.115 418416.866 5716005.666 418410.434 - 5716010.358 418378.954 5716033.278 418374.8 5716032.225 - 418370.339 5716031.093 418360.821 5716028.679 418414.107 - 5715990.62 418480.992 5715943.443 418494.132 5715934.286 - 418499.501 5715930.538 418516.833 5715918.441 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:typ>4000</xplan:typ> - <xplan:zugunstenVon>ENVIA</xplan:zugunstenVon> - </xplan:BP_Wegerecht> - </gml:featureMember> - <gml:featureMember> - <xplan:BP_Wegerecht gml:id="FEATURE_b18299c4-d9db-41c1-9b52-440205f6cec8"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertZuBP_Bereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_50e7eb9a-658a-4b5d-a817-1cb9e77a2cb5"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_7e280b04-5d28-47f2-960d-b0cc16a204ff"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="32">418198.296 - 5715987.458 418157.999 5715977.238 418117.296 5715966.914 - 418101.213 5715961.185 418081.185 5715948.824 418071.203 - 5715942.664 418052.049 5715943.912 418032.022 5715936.939 - 417987.939 5715921.538 417957.825 5715911.002 417943.614 - 5715901.138 417935.068 5715895.206 417936.815 5715892.017 - 417937.932 5715889.889 417938.631 5715888.553 417939.602 - 5715886.696 417942.154 5715881.873 417950.565 5715887.711 - 417952.693 5715889.188 417964.701 5715897.522 417972.528 - 5715900.26 417992.888 5715907.384 418000.013 5715909.874 - 418001.213 5715910.293 418036.96 5715922.782 418041.609 - 5715924.4 418084.29 5715939.262 418087.224 5715940.284 - 418112.984 5715949.461 418157.697 5715965.391 418282.381 - 5716008.785 418198.296 5715987.458 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:typ>4000</xplan:typ> - <xplan:zugunstenVon>ENVIA</xplan:zugunstenVon> - </xplan:BP_Wegerecht> - </gml:featureMember> - <gml:featureMember> - <xplan:SO_SchutzgebietNaturschutzrecht - gml:id="FEATURE_0e35b6c0-51d8-4d55-a5e3-9a5297e48e5b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gehoertNachrichtlichZuBereich - xlink:href="#FEATURE_02c85610-df24-47e6-b21e-b527cc30c0a6" /> - <xplan:position> - <gml:MultiSurface srsName="EPSG:25833" - gml:id="GEOMETRY_b7924654-3c77-4de4-ad74-e319087695d7"> - <gml:surfaceMember> - <gml:Polygon srsName="EPSG:25833" - gml:id="GML_8f789c8b-9821-4d1d-b380-c61b325d9b32"> - <gml:exterior> - <gml:LinearRing> - <gml:posList srsDimension="2" count="20">418198.296 - 5715987.458 418157.999 5715977.238 418164.124 5715951.571 - 418167.411 5715937.74 418195.053 5715945.107 418212.915 - 5715949.867 418217.606 5715929.984 418227.602 5715932.757 - 418239.083 5715935.941 418255.102 5715940.384 418277.42 - 5715946.54 418272.221 5715968.133 418295.592 5715973.344 - 418293.774 5715980.457 418291.062 5715991.077 418306.819 - 5715995.165 418318.296 5715998.142 418313.059 5716016.565 - 418282.381 5716008.785 418198.296 5715987.458 </gml:posList> - </gml:LinearRing> - </gml:exterior> - </gml:Polygon> - </gml:surfaceMember> - </gml:MultiSurface> - </xplan:position> - <xplan:flaechenschluss>false</xplan:flaechenschluss> - <xplan:artDerFestlegung>1700</xplan:artDerFestlegung> - </xplan:SO_SchutzgebietNaturschutzrecht> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_008e4bb2-22b0-403c-bdf6-3823d44044bc"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418491.627 5715929.093</gml:lowerCorner> - <gml:upperCorner>418491.627 5715929.093</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_404ee0c3-4353-47ed-a6f9-a6d4a5f4a3f1"> - <gml:pos>418491.627 5715929.093</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_0127ba30-5c6c-4ab7-9d52-146ffdab6710"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418269.989 5715926.316</gml:lowerCorner> - <gml:upperCorner>418269.989 5715926.316</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_afbb9e6d-aad8-43fe-b111-fcd956a090a0"> - <gml:pos>418269.989 5715926.316</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_065b3791-19fb-4d74-87b1-d7243366b09f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418100.515 5715932.952</gml:lowerCorner> - <gml:upperCorner>418100.515 5715932.952</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_2b07deb7-e79b-4aab-8a0b-fba85fd8120a"> - <gml:pos>418100.515 5715932.952</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_074d7157-62b9-42bc-a35d-aa794164de62"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418408.103 5715791.639</gml:lowerCorner> - <gml:upperCorner>418408.103 5715791.639</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d91c686e-695e-46c2-9cf7-e8fcba750c98"> - <gml:pos>418408.103 5715791.639</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_0751ebea-8fc3-4aba-a14a-591551f466ca"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418176.457 5715709.342</gml:lowerCorner> - <gml:upperCorner>418176.457 5715709.342</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3e296ff0-cdd2-4aa3-8c40-55a9b3b0f3df"> - <gml:pos>418176.457 5715709.342</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_07a89c17-75d1-455d-af3b-369019a3ce41"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418408.534 5715794.781</gml:lowerCorner> - <gml:upperCorner>418408.534 5715794.781</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_1281994b-dcc4-4ccf-87f7-e8f8cd28cc3e"> - <gml:pos>418408.534 5715794.781</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_096d15a6-ed4f-4ee7-836b-3352b5d207f8"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418477.423 5715917.736</gml:lowerCorner> - <gml:upperCorner>418477.423 5715917.736</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_033aee7a-1542-489e-95f6-4373c6b7334a"> - <gml:pos>418477.423 5715917.736</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_0a0d737a-02a9-4441-b955-84be532ab570"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418049.179 5715895.753</gml:lowerCorner> - <gml:upperCorner>418049.179 5715895.753</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_cf95ef6a-e723-4700-b1a5-d03fc810af3f"> - <gml:pos>418049.179 5715895.753</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_0d19ff48-918d-4b69-868c-d126c29a086b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418441.872 5715932.545</gml:lowerCorner> - <gml:upperCorner>418441.872 5715932.545</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_463569d3-4a36-47b2-8fd3-d0d06bd91c9e"> - <gml:pos>418441.872 5715932.545</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_100be47d-8b1f-46f4-9c41-951e0321a8d5"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417985.078 5715751.068</gml:lowerCorner> - <gml:upperCorner>417985.078 5715751.068</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ee90333a-5c8a-4812-931d-ec32feb27195"> - <gml:pos>417985.078 5715751.068</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_11608f51-01e5-4363-af56-d1ac18286e03"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418351.843 5715957.355</gml:lowerCorner> - <gml:upperCorner>418351.843 5715957.355</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_524c29ea-5193-4ae9-b0f9-fb422e25068f"> - <gml:pos>418351.843 5715957.355</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_11af5dce-1680-4352-ba64-ae15225ca258"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418421.834 5715933.971</gml:lowerCorner> - <gml:upperCorner>418421.834 5715933.971</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0c801149-7fd4-4224-a7b9-71d806d87f97"> - <gml:pos>418421.834 5715933.971</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_122f37cc-22c3-4c4f-aa78-8a8f4503e8e0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418496.353 5715919.186</gml:lowerCorner> - <gml:upperCorner>418496.353 5715919.186</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_427bdf71-3aef-4ecd-a3ec-3ef73de39396"> - <gml:pos>418496.353 5715919.186</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_12af558d-60a9-4377-8b2d-a7f2a23ea592"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418169.111 5715713.027</gml:lowerCorner> - <gml:upperCorner>418169.111 5715713.027</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_13a3eae4-8db4-4976-952a-84fd75887890"> - <gml:pos>418169.111 5715713.027</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_131148c2-6cde-4a27-8459-95a66c210dff"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418116.208 5715946.219</gml:lowerCorner> - <gml:upperCorner>418116.208 5715946.219</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_273dea8e-7ae1-4766-9cb1-a8df22283a9b"> - <gml:pos>418116.208 5715946.219</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_13c1ab89-82c0-4d3b-89c9-73e152be8e19"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417990.83 5715946.816</gml:lowerCorner> - <gml:upperCorner>417990.83 5715946.816</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_4f7bdc69-ff91-47f6-b212-c4cd297d56f0"> - <gml:pos>417990.83 5715946.816</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_175d6121-6327-49a5-a1a6-121392a048e6"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418036.964 5715887.851</gml:lowerCorner> - <gml:upperCorner>418036.964 5715887.851</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_8e948a80-d47e-41b7-a93c-66941c23329b"> - <gml:pos>418036.964 5715887.851</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_1816b7f9-ee7a-4b7c-a941-511bbecac022"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418165.512 5715708.831</gml:lowerCorner> - <gml:upperCorner>418165.512 5715708.831</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9cd92e8c-93b6-49b2-a4b5-84e1974cfaf3"> - <gml:pos>418165.512 5715708.831</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_19a51158-72e6-438d-af7e-d5ebc04c0985"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418038.553 5715898.577</gml:lowerCorner> - <gml:upperCorner>418038.553 5715898.577</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_72230506-41ea-48c2-add2-aa734b57ccb9"> - <gml:pos>418038.553 5715898.577</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_1b771a61-24a9-4c53-9653-c2d95c7f09a7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418395.097 5715802.853</gml:lowerCorner> - <gml:upperCorner>418395.097 5715802.853</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ddafb083-5b00-4245-8c96-709bb0af3883"> - <gml:pos>418395.097 5715802.853</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_1ccab59c-06af-4a8f-a28b-bda33d36a62a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418078.008 5715913.29</gml:lowerCorner> - <gml:upperCorner>418078.008 5715913.29</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3c76e35c-434f-49df-b39a-cc5f004ffe13"> - <gml:pos>418078.008 5715913.29</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_2079b634-36a5-473e-b2e2-cbbaf747f66c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418193.035 5715942.356</gml:lowerCorner> - <gml:upperCorner>418193.035 5715942.356</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9d5f1dd5-6676-42fd-a7d6-bd9ef5a54930"> - <gml:pos>418193.035 5715942.356</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_2100d9ce-320d-4a6b-b6fb-f45ff4686378"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418391.806 5715803.118</gml:lowerCorner> - <gml:upperCorner>418391.806 5715803.118</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_45b864f2-6c89-4fb8-bd88-a850f043465d"> - <gml:pos>418391.806 5715803.118</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_243855d4-6068-47a4-bb40-851716c323c1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418038.075 5715921.289</gml:lowerCorner> - <gml:upperCorner>418038.075 5715921.289</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_238c7c4e-b5b8-4832-81e7-f02e911ec743"> - <gml:pos>418038.075 5715921.289</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_256c16df-4ac3-4a0d-9cbe-4a65d832a818"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418144.373 5715923.895</gml:lowerCorner> - <gml:upperCorner>418144.373 5715923.895</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_a6a8f611-cf13-4ed9-9db8-61c4db766e1f"> - <gml:pos>418144.373 5715923.895</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_2657a858-f178-4177-99a3-954ac8d5ad43"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418129.161 5715718.495</gml:lowerCorner> - <gml:upperCorner>418129.161 5715718.495</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e4253fab-e17d-401d-b466-371dac70eff4"> - <gml:pos>418129.161 5715718.495</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_28e5df9a-e33f-4742-9e2b-d2624c159842"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418115.754 5715920.209</gml:lowerCorner> - <gml:upperCorner>418115.754 5715920.209</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_1064ffc2-4aa8-403d-864a-10af3d4ae163"> - <gml:pos>418115.754 5715920.209</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_2b22655c-6cb0-42a4-a4cd-6bbb8bb48e31"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418137.245 5715910.662</gml:lowerCorner> - <gml:upperCorner>418137.245 5715910.662</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e121a11e-a2df-459e-a360-4c24ca603562"> - <gml:pos>418137.245 5715910.662</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_2efabbd9-11d5-4110-b93b-ed3666e93323"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417931.738 5715923.716</gml:lowerCorner> - <gml:upperCorner>417931.738 5715923.716</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_bfb59622-ceaf-4979-b617-83fcba80393e"> - <gml:pos>417931.738 5715923.716</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_308fc525-15f5-406f-a686-12e100a9f598"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418096.226 5715931.081</gml:lowerCorner> - <gml:upperCorner>418096.226 5715931.081</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_87cf3cb4-b64f-428c-808a-1ce5ca2a9345"> - <gml:pos>418096.226 5715931.081</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_31cf4645-dffd-46d6-9f34-69c2c378ebb9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418252.259 5715941.724</gml:lowerCorner> - <gml:upperCorner>418252.259 5715941.724</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_69856919-ac0d-4b9a-80ae-43f0f6d7d8d6"> - <gml:pos>418252.259 5715941.724</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_3383327e-a0a1-44c9-8bd0-b2b7e003c1dc"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418481.569 5715929.813</gml:lowerCorner> - <gml:upperCorner>418481.569 5715929.813</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_91e94298-1a0a-4a11-a96c-b3cda9091443"> - <gml:pos>418481.569 5715929.813</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_3688bc8e-9718-4a86-b00b-41230dcb50d0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418167.508 5715713.595</gml:lowerCorner> - <gml:upperCorner>418167.508 5715713.595</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e7731ac4-5ee3-45f9-b291-3db1ada66085"> - <gml:pos>418167.508 5715713.595</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_36e864ce-2f43-415d-9560-4f909df42bcc"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418007.008 5715752.191</gml:lowerCorner> - <gml:upperCorner>418007.008 5715752.191</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d242e8b9-4de6-4266-93e5-3253a83bb894"> - <gml:pos>418007.008 5715752.191</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_39a7fe19-cf78-4fd3-b9f5-25e6b79917b0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418102.314 5715942.002</gml:lowerCorner> - <gml:upperCorner>418102.314 5715942.002</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0000bf53-42cb-4f7c-a520-acf46ccacc26"> - <gml:pos>418102.314 5715942.002</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_3a028a16-a16f-4371-9c61-16f22df0a6ec"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418397.952 5715747.295</gml:lowerCorner> - <gml:upperCorner>418397.952 5715747.295</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_6c4900f2-03df-4219-b837-95fb7bb94021"> - <gml:pos>418397.952 5715747.295</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_3e2f4832-a7bb-4305-97f5-e891657b6de3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418306.226 5715922.595</gml:lowerCorner> - <gml:upperCorner>418306.226 5715922.595</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_6267b7a7-928a-4399-8579-9db0194df411"> - <gml:pos>418306.226 5715922.595</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_3e4e65ee-2b29-409b-b4e4-adaced47ae6e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418320.506 5715925.22</gml:lowerCorner> - <gml:upperCorner>418320.506 5715925.22</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_b617f743-150d-47be-a1e0-13ca6b86d035"> - <gml:pos>418320.506 5715925.22</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_4019ac81-4117-40e5-b520-62c112534cf0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418364.855 5715938.078</gml:lowerCorner> - <gml:upperCorner>418364.855 5715938.078</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0dff69e9-2b89-4e28-96cb-a8ac0a7230fa"> - <gml:pos>418364.855 5715938.078</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_4136597d-33a6-4397-ab23-9201a70050ad"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418023.281 5715853.074</gml:lowerCorner> - <gml:upperCorner>418023.281 5715853.074</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_a69d8713-c76f-490b-ad55-f6cba1994a97"> - <gml:pos>418023.281 5715853.074</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_42f2240c-a0d1-4c15-8060-97406da32e02"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418272.1 5715913.666</gml:lowerCorner> - <gml:upperCorner>418272.1 5715913.666</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_f47e03a2-897b-4c5c-80b7-34c9f5c2af66"> - <gml:pos>418272.1 5715913.666</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_434b3ef8-ea33-4bd9-8ede-6e56faa013a7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417980.251 5715851.9</gml:lowerCorner> - <gml:upperCorner>417980.251 5715851.9</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3e898808-647e-4383-b173-66c39ab4338b"> - <gml:pos>417980.251 5715851.9</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_439769d0-5eb3-44a1-bad3-fc11d381c712"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417969.441 5715873.847</gml:lowerCorner> - <gml:upperCorner>417969.441 5715873.847</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9a104ab4-9c32-4c6c-8fd5-66ef79bef744"> - <gml:pos>417969.441 5715873.847</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_44d9f271-1434-4d83-a3f6-838f6d9f3996"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418461.642 5715931.121</gml:lowerCorner> - <gml:upperCorner>418461.642 5715931.121</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_6a779088-7a6d-4134-a0eb-6796322e8dc2"> - <gml:pos>418461.642 5715931.121</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_45bbb0b8-6f2b-44b1-9238-71fe562f41b6"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418194.23 5715895.029</gml:lowerCorner> - <gml:upperCorner>418194.23 5715895.029</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_1e010733-a6fe-4949-8d20-15b3c9515e8e"> - <gml:pos>418194.23 5715895.029</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_45cab8b4-9f3c-4a0f-a846-8704a8474908"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418170.162 5715713.341</gml:lowerCorner> - <gml:upperCorner>418170.162 5715713.341</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c9a40dbc-d8b8-4961-bbd7-f8d4cc21b6f1"> - <gml:pos>418170.162 5715713.341</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_4676ce0e-fb0d-4025-b18b-35a7d7004a9d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418120.788 5715719.394</gml:lowerCorner> - <gml:upperCorner>418120.788 5715719.394</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_8c37cde3-b5a9-4f53-8080-0deab4017275"> - <gml:pos>418120.788 5715719.394</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_47261bc1-3881-4179-97c6-27adac5610a4"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418477.642 5715919.448</gml:lowerCorner> - <gml:upperCorner>418477.642 5715919.448</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3ec21cfd-44d4-4d5e-b08b-4cccc672ab7e"> - <gml:pos>418477.642 5715919.448</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_48b0eaa6-bb6b-4735-b28d-7d3f93472250"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418494.357 5715707.764</gml:lowerCorner> - <gml:upperCorner>418494.357 5715707.764</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_5c285cba-8ee7-4640-9922-b8565a894b7a"> - <gml:pos>418494.357 5715707.764</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_48be2832-e377-4d76-aea8-f849bb1c52ea"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418401.881 5715935.31</gml:lowerCorner> - <gml:upperCorner>418401.881 5715935.31</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_4907a2fa-7d98-455b-b2ce-3d914946d24c"> - <gml:pos>418401.881 5715935.31</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_4ecda823-53fa-4a33-98e9-2836b75c97f9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418169.249 5715703.954</gml:lowerCorner> - <gml:upperCorner>418169.249 5715703.954</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c1294098-2ad6-4413-8277-caa52e83189f"> - <gml:pos>418169.249 5715703.954</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_5108d3a4-a5d0-41f4-ad23-f94dd47fc6eb"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418125.122 5715716.328</gml:lowerCorner> - <gml:upperCorner>418125.122 5715716.328</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_14ab3bbd-31a5-40aa-aa81-b2d7b10fc970"> - <gml:pos>418125.122 5715716.328</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_5252e8d4-4da2-4fd9-9757-400370027bd1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418139.585 5715699.06</gml:lowerCorner> - <gml:upperCorner>418139.585 5715699.06</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_5f1422c8-266d-4285-b91e-d33981492e29"> - <gml:pos>418139.585 5715699.06</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_537b24cc-80f9-41fc-8baa-0646d7579ad6"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418340.135 5715929.809</gml:lowerCorner> - <gml:upperCorner>418340.135 5715929.809</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0d0baf26-3015-4c4a-92b9-aab89da2856f"> - <gml:pos>418340.135 5715929.809</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_55623860-725c-43df-8a55-6a42ec958681"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418381.2 5715803.365</gml:lowerCorner> - <gml:upperCorner>418381.2 5715803.365</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_20faece7-6742-47ac-99f7-db3237015691"> - <gml:pos>418381.2 5715803.365</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_567026d2-9ca3-47dd-a6b8-e2b63c5f494f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417940.628 5715905.47</gml:lowerCorner> - <gml:upperCorner>417940.628 5715905.47</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d22b6d81-0959-4276-8d81-ac8c000932e1"> - <gml:pos>417940.628 5715905.47</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_58fe6025-b86b-4404-a840-ffddd4a7dcbf"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418167.503 5715701.538</gml:lowerCorner> - <gml:upperCorner>418167.503 5715701.538</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_53e4e072-01a2-4a5b-bf3f-b49712f58663"> - <gml:pos>418167.503 5715701.538</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_59104e74-83a3-499a-a668-ec4b20f007ba"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418359.627 5715934.369</gml:lowerCorner> - <gml:upperCorner>418359.627 5715934.369</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_f8fb5b8a-0abd-4542-9df0-aaab250fa549"> - <gml:pos>418359.627 5715934.369</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_5acc36d8-d4eb-45b8-b700-bcec1068113f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418098.806 5715939.703</gml:lowerCorner> - <gml:upperCorner>418098.806 5715939.703</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_028758ba-f7bb-4351-a5eb-391bf311459b"> - <gml:pos>418098.806 5715939.703</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_5bdbd361-1ff0-4fd6-8cd4-b0c7f7a70805"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418000.312 5715760.656</gml:lowerCorner> - <gml:upperCorner>418000.312 5715760.656</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_31201507-6d78-48a9-9ca1-1a7b509a76a8"> - <gml:pos>418000.312 5715760.656</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_5c32aaf6-4d9c-4d42-8249-4c11fb7d9850"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418389.476 5715738.972</gml:lowerCorner> - <gml:upperCorner>418389.476 5715738.972</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_1eb4ef59-8589-4aeb-b5aa-71a96259ebff"> - <gml:pos>418389.476 5715738.972</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_5f8b580e-4b26-4883-8fce-1815549a805c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418404.778 5715765.834</gml:lowerCorner> - <gml:upperCorner>418404.778 5715765.834</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d76bebd8-b26c-4140-962e-882a42afe9fd"> - <gml:pos>418404.778 5715765.834</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_603b239e-e4f6-4e1d-9ffa-f7ea86a1f9d0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418160.163 5715696.096</gml:lowerCorner> - <gml:upperCorner>418160.163 5715696.096</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_cc597fdb-289d-4bc8-b465-e84a29dc0432"> - <gml:pos>418160.163 5715696.096</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_63a1fd41-c1af-4298-8f3f-fb519e62025f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418398.573 5715802.694</gml:lowerCorner> - <gml:upperCorner>418398.573 5715802.694</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_83663695-d781-4870-8f9a-b31487160efc"> - <gml:pos>418398.573 5715802.694</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_63f1ce53-32ae-4c7f-8c57-9d3e7b75e47a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418377.163 5715803.467</gml:lowerCorner> - <gml:upperCorner>418377.163 5715803.467</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3b66a832-90b7-4445-99ce-c331322b9b6e"> - <gml:pos>418377.163 5715803.467</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_642607fe-4039-499c-892e-f0961205a98e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418126.135 5715719.836</gml:lowerCorner> - <gml:upperCorner>418126.135 5715719.836</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_5d7c7372-396b-40b9-a906-4a9c0ee4a220"> - <gml:pos>418126.135 5715719.836</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_652b5913-b054-4d98-a916-ada57177fe7b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418040.704 5715923.959</gml:lowerCorner> - <gml:upperCorner>418040.704 5715923.959</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_2eb97558-33d7-41a4-883d-2f43e0146a58"> - <gml:pos>418040.704 5715923.959</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_65949f10-2e96-45fe-a0f4-87f6c7a8f370"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418023.671 5715753.715</gml:lowerCorner> - <gml:upperCorner>418023.671 5715753.715</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_bafc6a8c-8ceb-4f09-94fe-732bc254d9f5"> - <gml:pos>418023.671 5715753.715</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_65e27f26-9fe5-4698-bde5-1861d540c443"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418159.418 5715696.611</gml:lowerCorner> - <gml:upperCorner>418159.418 5715696.611</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_b860ed02-0b73-452d-884a-eeb687d71354"> - <gml:pos>418159.418 5715696.611</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_67403378-84b2-4f08-84fa-0700797a11a3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418403.196 5715761.289</gml:lowerCorner> - <gml:upperCorner>418403.196 5715761.289</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_57fa69f2-a6be-43ec-99f9-4e057cb256f4"> - <gml:pos>418403.196 5715761.289</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_688ba8f4-8011-466b-ad3f-0c91c0145b42"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418035.145 5715900.968</gml:lowerCorner> - <gml:upperCorner>418035.145 5715900.968</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_810e2c36-8cd0-4bf6-916c-7c67cb38dc9b"> - <gml:pos>418035.145 5715900.968</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_6bd2b510-aa2a-4b04-bc96-6fd3c49a52ed"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418146.988 5715697.03</gml:lowerCorner> - <gml:upperCorner>418146.988 5715697.03</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_75ffdbad-e7a2-4ab9-af7e-b1192972c39c"> - <gml:pos>418146.988 5715697.03</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_6cfcbf4e-8ea6-495f-be05-355bbf263746"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418411.791 5715934.636</gml:lowerCorner> - <gml:upperCorner>418411.791 5715934.636</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_8c2ad7f6-fe72-4242-839c-021b356e26be"> - <gml:pos>418411.791 5715934.636</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_6d8ce562-8926-4bc4-9b46-8a0c7250d59a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418369.319 5715936.71</gml:lowerCorner> - <gml:upperCorner>418369.319 5715936.71</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9953b8e4-ef04-466c-8930-c254a6b82de7"> - <gml:pos>418369.319 5715936.71</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_70d2ea8e-bc6c-41b8-8b2e-03e2f4290045"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418279.388 5715854.865</gml:lowerCorner> - <gml:upperCorner>418279.388 5715854.865</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_cab815e2-cc9b-4e78-8f9e-e48f9ff5e7a1"> - <gml:pos>418279.388 5715854.865</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_720fb497-c82a-4502-b114-aedd360c143e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418349.805 5715932.127</gml:lowerCorner> - <gml:upperCorner>418349.805 5715932.127</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_198864e5-ecef-4183-8493-156ebccd7ea3"> - <gml:pos>418349.805 5715932.127</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_72428c60-5112-4123-997b-5cfc316d80ac"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418169.436 5715716.299</gml:lowerCorner> - <gml:upperCorner>418169.436 5715716.299</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_141a137d-167a-4f65-849d-f1ae9d86dee9"> - <gml:pos>418169.436 5715716.299</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_72ee85c9-540b-4f35-91b6-56e4923fb36f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418184.585 5715892.719</gml:lowerCorner> - <gml:upperCorner>418184.585 5715892.719</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9aff324b-26fe-4bcf-a1e8-a2b785cb5403"> - <gml:pos>418184.585 5715892.719</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7305509f-91ac-4785-9e35-d9be86689435"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418172.313 5715719.118</gml:lowerCorner> - <gml:upperCorner>418172.313 5715719.118</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_15830fa8-fc78-40da-84f3-2ec56d622a22"> - <gml:pos>418172.313 5715719.118</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_749fecfa-f6df-4982-9c43-d71d4b5bd907"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418398.648 5715755.736</gml:lowerCorner> - <gml:upperCorner>418398.648 5715755.736</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0619d635-8c51-4aaf-a21e-ea16558a7139"> - <gml:pos>418398.648 5715755.736</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7551e6c4-01f1-49b3-a14a-320930d0d924"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418056.659 5715930.596</gml:lowerCorner> - <gml:upperCorner>418056.659 5715930.596</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_acb0ff59-41c6-491f-9cd6-c4ddc89a321b"> - <gml:pos>418056.659 5715930.596</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_756f42df-3489-465d-9b01-904dc56c149b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418406.6 5715799.438</gml:lowerCorner> - <gml:upperCorner>418406.6 5715799.438</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_289615a5-24ea-4a2c-bb0d-9bb747064543"> - <gml:pos>418406.6 5715799.438</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_76ce837e-0daa-4f53-8109-1aa4e095f55f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418165.114 5715888.226</gml:lowerCorner> - <gml:upperCorner>418165.114 5715888.226</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_badff7dc-c3d0-481e-80e2-14b9fded8a4e"> - <gml:pos>418165.114 5715888.226</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7a14b013-58e5-44a8-b6f7-bd8ac8038daf"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418155.188 5715885.821</gml:lowerCorner> - <gml:upperCorner>418155.188 5715885.821</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3114477d-5f6c-4aa0-97d7-9028c80fc899"> - <gml:pos>418155.188 5715885.821</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7a1ed9d2-fb82-4848-8dad-6b2dd5d9c464"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418101.859 5715933.561</gml:lowerCorner> - <gml:upperCorner>418101.859 5715933.561</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_6999670c-7c4f-4fdf-bfda-c293df48e18b"> - <gml:pos>418101.859 5715933.561</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7a2daf54-2262-44a7-9653-9ae7239a8b30"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418292.711 5715977.689</gml:lowerCorner> - <gml:upperCorner>418292.711 5715977.689</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_36e203a7-51ef-4b5b-8f21-79d6168c7f06"> - <gml:pos>418292.711 5715977.689</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7a3ca1f1-2988-478e-b6c5-307a129540e8"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417984.997 5715944.18</gml:lowerCorner> - <gml:upperCorner>417984.997 5715944.18</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_79d02e6e-99bd-421c-9009-d523dade1c17"> - <gml:pos>417984.997 5715944.18</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7a63dc4b-41e9-4619-a219-c1eeed2af426"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418471.551 5715930.415</gml:lowerCorner> - <gml:upperCorner>418471.551 5715930.415</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_264a8fec-9433-497a-9bf8-f7281cdc3937"> - <gml:pos>418471.551 5715930.415</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7ad58852-99a6-467d-b22c-a37129b90bf2"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418174.768 5715890.483</gml:lowerCorner> - <gml:upperCorner>418174.768 5715890.483</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_6533d61f-ffaa-4f3c-a6bf-e95d2b8633c0"> - <gml:pos>418174.768 5715890.483</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7af7d583-98e7-488b-b3d4-516a9b54204d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417971.444 5715832.147</gml:lowerCorner> - <gml:upperCorner>417971.444 5715832.147</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_388f7578-49ff-49d1-ae43-a167f92ef4cd"> - <gml:pos>417971.444 5715832.147</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7b70ebc7-2336-4793-9905-397bb2a566e9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418353.17 5716009.729</gml:lowerCorner> - <gml:upperCorner>418353.17 5716009.729</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_42faddf8-227f-4c69-940a-aee219ced136"> - <gml:pos>418353.17 5716009.729</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7bc06abc-6f8f-4919-93ac-faee0adb74f6"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418169.422 5715701.985</gml:lowerCorner> - <gml:upperCorner>418169.422 5715701.985</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_7a885e0c-6608-4436-be4b-c4745b1c6626"> - <gml:pos>418169.422 5715701.985</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7e649e23-7cbc-4816-be40-c741ba626450"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418012.486 5715895.939</gml:lowerCorner> - <gml:upperCorner>418012.486 5715895.939</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_1ebbf9e8-74e0-4364-819f-c68891e14062"> - <gml:pos>418012.486 5715895.939</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7e67ad3a-f8b7-4eae-a88b-26f125eb1077"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418291.344 5715918.162</gml:lowerCorner> - <gml:upperCorner>418291.344 5715918.162</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ed6a6f21-8a88-4bd9-8d24-9c0ccfa82e13"> - <gml:pos>418291.344 5715918.162</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_7feb9df0-8293-4d4d-84ce-d7c46c5a4f22"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418459.002 5715901.115</gml:lowerCorner> - <gml:upperCorner>418459.002 5715901.115</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_872255f7-2ed2-43fe-a9fe-0b22a3326603"> - <gml:pos>418459.002 5715901.115</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_80a60d5e-cbcf-477b-be32-7a16ac11a930"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418460.554 5715881.844</gml:lowerCorner> - <gml:upperCorner>418460.554 5715881.844</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_1db0be17-a5b7-47ba-91a0-523587f8cf47"> - <gml:pos>418460.554 5715881.844</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_8254c274-a4fd-4f20-a225-d0f7680b590d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418237.509 5715970.753</gml:lowerCorner> - <gml:upperCorner>418237.509 5715970.753</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_296a06e4-46a0-403d-9350-0b8f3a7151d1"> - <gml:pos>418237.509 5715970.753</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_82f39669-a920-4209-aa74-f2fe3136b2ba"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418233.176 5715904.39</gml:lowerCorner> - <gml:upperCorner>418233.176 5715904.39</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e4f2e49a-435a-4f38-922f-47a64606c691"> - <gml:pos>418233.176 5715904.39</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_835b6b8a-ffab-4065-9066-7ce23a70b6f9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418310.756 5715922.842</gml:lowerCorner> - <gml:upperCorner>418310.756 5715922.842</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_363f4ca9-d331-450f-818c-5785b0fa2330"> - <gml:pos>418310.756 5715922.842</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_837155cd-3234-490c-a417-4e1137dbab7a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418355.328 5716015.309</gml:lowerCorner> - <gml:upperCorner>418355.328 5716015.309</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_4433c1cf-1e5d-46db-95d9-2bd51aa09aa4"> - <gml:pos>418355.328 5716015.309</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_83dfba7a-eaae-4a98-9308-73a4b755fcbd"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418166.423 5715714.059</gml:lowerCorner> - <gml:upperCorner>418166.423 5715714.059</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_a0a1dcce-0832-46e2-b7b7-d8c74c777d73"> - <gml:pos>418166.423 5715714.059</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_8a452d37-6f65-4bcc-9290-646169d912a6"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418007.422 5715816.752</gml:lowerCorner> - <gml:upperCorner>418007.422 5715816.752</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_134603d2-5582-45d9-857b-c5abf611d129"> - <gml:pos>418007.422 5715816.752</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_8c6c8b49-3f8a-4e26-ab93-6913c729da29"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417996.356 5715751.558</gml:lowerCorner> - <gml:upperCorner>417996.356 5715751.558</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9a0809e0-97dc-4b46-81f6-92a15d46a31b"> - <gml:pos>417996.356 5715751.558</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_8cb7e1fc-a3c7-40e5-8737-264bafda2597"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418402.466 5715802.51</gml:lowerCorner> - <gml:upperCorner>418402.466 5715802.51</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_acf62311-b038-4270-9543-e80efd00f41f"> - <gml:pos>418402.466 5715802.51</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_8ea91c6b-4e08-445c-8db2-db3bf9c02d25"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418120.562 5715890.467</gml:lowerCorner> - <gml:upperCorner>418120.562 5715890.467</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ff8476cd-ae72-4b2f-9472-c61adddcd1d8"> - <gml:pos>418120.562 5715890.467</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_8f2e85ff-6a1d-446d-9ad5-dbd9acac84d3"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418262.327 5715911.339</gml:lowerCorner> - <gml:upperCorner>418262.327 5715911.339</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_6ecfdaa3-98e8-4b2b-94b4-cdbb25b26989"> - <gml:pos>418262.327 5715911.339</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_8f5002f1-d9dd-4a05-a265-1ca7d3812904"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418401.451 5715758.106</gml:lowerCorner> - <gml:upperCorner>418401.451 5715758.106</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_087735e4-5795-4f57-a448-f54753e81900"> - <gml:pos>418401.451 5715758.106</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_8fd2b7ef-90e3-4558-b6e6-60422c038464"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418405.941 5715748.13</gml:lowerCorner> - <gml:upperCorner>418405.941 5715748.13</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_491c7188-a218-41d7-9fce-11226dfc09cf"> - <gml:pos>418405.941 5715748.13</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_906d3a53-0dd5-451b-85ca-5a6ba3d53769"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418370.184 5715847.344</gml:lowerCorner> - <gml:upperCorner>418370.184 5715847.344</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_319da3c9-3015-4747-8aab-c7e19ff513d5"> - <gml:pos>418370.184 5715847.344</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_938b04c9-c990-4c76-a5f2-87e10f43170c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418508.812 5715919.606</gml:lowerCorner> - <gml:upperCorner>418508.812 5715919.606</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_dc87a4d5-c40d-4c0b-b994-2f62d924f606"> - <gml:pos>418508.812 5715919.606</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_965a3f16-f641-4529-89cd-ad84f0130199"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418203.88 5715897.349</gml:lowerCorner> - <gml:upperCorner>418203.88 5715897.349</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d42f3d5a-f9ca-4be4-a305-6d6e4a8c6b9a"> - <gml:pos>418203.88 5715897.349</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_97c38385-cc8d-432c-9b86-179a967699ba"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418301.098 5715920.578</gml:lowerCorner> - <gml:upperCorner>418301.098 5715920.578</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e420ba3a-eda6-4b6a-b0e1-ea460ea41e9f"> - <gml:pos>418301.098 5715920.578</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_98502b5e-416c-43f4-9238-8c9e39b1adba"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418095.53 5715935.107</gml:lowerCorner> - <gml:upperCorner>418095.53 5715935.107</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_81d0a452-6aaf-4c1e-ad3c-9399175a1467"> - <gml:pos>418095.53 5715935.107</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_98504bd0-dbee-4cfc-813a-7e52160e9d57"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418273.179 5715963.641</gml:lowerCorner> - <gml:upperCorner>418273.179 5715963.641</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_cbdaa3f3-1c99-4b7e-8e5b-f04ecfc83447"> - <gml:pos>418273.179 5715963.641</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_985c5a83-27cb-4d34-9475-e3a6bf765ee7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418272.874 5715966.956</gml:lowerCorner> - <gml:upperCorner>418272.874 5715966.956</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_56f5a3b5-44fb-4f44-b444-4113a9863005"> - <gml:pos>418272.874 5715966.956</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_9b267b8e-1675-40a3-af26-2cc1e5e23c92"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418381.719 5715936.582</gml:lowerCorner> - <gml:upperCorner>418381.719 5715936.582</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_29c98121-355a-42e7-9ed7-db088186688a"> - <gml:pos>418381.719 5715936.582</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_9b8f3cfa-4e2a-4c54-87bc-fc27bec2e289"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418361.943 5715997.189</gml:lowerCorner> - <gml:upperCorner>418361.943 5715997.189</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d5bf7d35-35d9-4eb7-9839-eaf61727a507"> - <gml:pos>418361.943 5715997.189</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_9c10a5c4-4d3d-4210-9019-30f74a337cfb"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418384.887 5715803.369</gml:lowerCorner> - <gml:upperCorner>418384.887 5715803.369</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_35ac330b-1af9-4350-b86b-cae5288006f8"> - <gml:pos>418384.887 5715803.369</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_9c4c3ea5-61b5-4cfa-9d56-3846586a178f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418116.529 5715928.639</gml:lowerCorner> - <gml:upperCorner>418116.529 5715928.639</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_2c242a98-d205-47e7-a0e5-bf7c6642d936"> - <gml:pos>418116.529 5715928.639</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_9cc2a152-ede7-44f7-b5a4-bbd5b6c0e8c9"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418514.315 5715917.969</gml:lowerCorner> - <gml:upperCorner>418514.315 5715917.969</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_52a2631f-8c22-481a-9121-5a6c0bb0ec29"> - <gml:pos>418514.315 5715917.969</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_9ce4a580-6daa-417b-a7d9-d89dd0a6bb2d"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418407.061 5715769.791</gml:lowerCorner> - <gml:upperCorner>418407.061 5715769.791</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e67a8b22-aa8f-4caf-b329-f22ca6f50526"> - <gml:pos>418407.061 5715769.791</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_9d986998-2d3f-48c1-85fe-ffd532588d8a"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418032.362 5715855.16</gml:lowerCorner> - <gml:upperCorner>418032.362 5715855.16</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_320dc818-84fa-46bb-99d6-574b5cc051e7"> - <gml:pos>418032.362 5715855.16</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_9f1a22a0-4d80-4fb7-8c4a-ae961aadd5c0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418157.52 5715692.363</gml:lowerCorner> - <gml:upperCorner>418157.52 5715692.363</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_f4bbbf09-5691-4518-9453-da594fea838f"> - <gml:pos>418157.52 5715692.363</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_a013e874-a436-494f-a218-13cb59c83e91"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418380.161 5716004.738</gml:lowerCorner> - <gml:upperCorner>418380.161 5716004.738</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e7a2d43c-e605-41ef-97d3-7a421df2ce57"> - <gml:pos>418380.161 5716004.738</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_a1524797-796b-495b-b558-53c56c22c67f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418480.054 5715918.841</gml:lowerCorner> - <gml:upperCorner>418480.054 5715918.841</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_981338cb-ea8d-4dc0-afd2-ca7c5bd69aef"> - <gml:pos>418480.054 5715918.841</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_a24085ef-6328-43e0-a4cd-ad7eb4ced375"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418269.885 5715934.976</gml:lowerCorner> - <gml:upperCorner>418269.885 5715934.976</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_dfad426f-6325-4b26-8ed8-27b56a86a338"> - <gml:pos>418269.885 5715934.976</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_a33824d3-cefb-4ff1-96dc-6d9b66248111"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418018.553 5715752.916</gml:lowerCorner> - <gml:upperCorner>418018.553 5715752.916</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9fd974ab-162f-4c2d-9751-bacb579a0862"> - <gml:pos>418018.553 5715752.916</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_a4de83a0-817c-4aaf-a00b-f5c60b0d0dd7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418373.597 5715803.859</gml:lowerCorner> - <gml:upperCorner>418373.597 5715803.859</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3c642447-cd0f-4122-b345-86ab0fa32930"> - <gml:pos>418373.597 5715803.859</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_a5046ad3-693d-4ae4-8056-a049d1b2c41f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418181.008 5715731.217</gml:lowerCorner> - <gml:upperCorner>418181.008 5715731.217</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_02961029-9d25-4d04-aac2-f5030a656e5b"> - <gml:pos>418181.008 5715731.217</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_a69e80d1-e84f-42e2-a94d-80f02ab1497e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418028.091 5715907.796</gml:lowerCorner> - <gml:upperCorner>418028.091 5715907.796</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_1bcfa8ce-340b-4b8d-a5d5-16322958facf"> - <gml:pos>418028.091 5715907.796</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_a8bbb716-53db-480e-b78c-bfb84fe76328"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418370.043 5715880.273</gml:lowerCorner> - <gml:upperCorner>418370.043 5715880.273</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0808fb7e-f261-4a4c-97ea-e966d4c39b68"> - <gml:pos>418370.043 5715880.273</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_a9489baa-163b-41a9-addc-3716b3d632a0"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418167.13 5715697.515</gml:lowerCorner> - <gml:upperCorner>418167.13 5715697.515</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_7576a3ea-7f17-4d1b-9835-44ecaba73553"> - <gml:pos>418167.13 5715697.515</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_a95e311a-3c11-4941-99fd-eeda24f1c451"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418451.706 5715931.786</gml:lowerCorner> - <gml:upperCorner>418451.706 5715931.786</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_e662bd8f-ecc1-4602-b687-c9f43ec62228"> - <gml:pos>418451.706 5715931.786</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_aa5969a3-4f38-45cf-b577-976834c76d5b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418388.023 5715803.117</gml:lowerCorner> - <gml:upperCorner>418388.023 5715803.117</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_5ee75325-93b1-4d7c-99f1-879a32674218"> - <gml:pos>418388.023 5715803.117</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_ab9b2303-66cf-445e-83c7-c916e59cb265"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418493.491 5715897.454</gml:lowerCorner> - <gml:upperCorner>418493.491 5715897.454</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_911839e3-f521-4a7c-a56a-b41d24ddd5ac"> - <gml:pos>418493.491 5715897.454</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_abb94047-3b0b-495c-9a26-4c397dc09ee4"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418484.857 5715702.861</gml:lowerCorner> - <gml:upperCorner>418484.857 5715702.861</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_aab961a2-0004-4b5f-a1ea-34209a61082e"> - <gml:pos>418484.857 5715702.861</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_aef2f522-6391-4954-ab09-bd2e51b33e77"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418141.019 5715696.646</gml:lowerCorner> - <gml:upperCorner>418141.019 5715696.646</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9e0d51ee-4879-452c-8f93-4544a431d279"> - <gml:pos>418141.019 5715696.646</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_b3483514-d846-4af9-8ebc-14326f256f1c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418305.632 5715877.703</gml:lowerCorner> - <gml:upperCorner>418305.632 5715877.703</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_3795a9ec-a30e-4953-9c0f-210ba88743b7"> - <gml:pos>418305.632 5715877.703</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_b5eed084-c2a1-4d64-ae24-ee95f5a8d402"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418122.673 5715777.192</gml:lowerCorner> - <gml:upperCorner>418122.673 5715777.192</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_2c8367f6-f512-4434-a489-2710824dd674"> - <gml:pos>418122.673 5715777.192</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_b6c7e552-be49-49aa-8fcc-d20b6a3b0375"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418170.393 5715712.363</gml:lowerCorner> - <gml:upperCorner>418170.393 5715712.363</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_246b64b1-5a36-4ed9-8b1a-6f0963d5b675"> - <gml:pos>418170.393 5715712.363</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_b7e3727c-93f6-4d1b-a206-f338869972fe"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418277.038 5715955.003</gml:lowerCorner> - <gml:upperCorner>418277.038 5715955.003</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_cb842255-b73c-4dab-bbae-85ade7b16c66"> - <gml:pos>418277.038 5715955.003</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_b978cc8d-148b-4431-9d52-3c122cfd480e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418410.576 5715778.549</gml:lowerCorner> - <gml:upperCorner>418410.576 5715778.549</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_96ca5e54-6603-4096-b804-24123aacaa26"> - <gml:pos>418410.576 5715778.549</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_baa4bf42-622c-474f-89b1-3ae0440fa746"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418243.02 5715906.671</gml:lowerCorner> - <gml:upperCorner>418243.02 5715906.671</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_099cb78f-6720-4ac8-8439-bbe077dbe552"> - <gml:pos>418243.02 5715906.671</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_bb92aaeb-2cd7-49f6-b56d-fe4e564d0637"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418135.037 5715705.565</gml:lowerCorner> - <gml:upperCorner>418135.037 5715705.565</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_19c05cfc-5cee-4b60-b17f-1fffec45c5c3"> - <gml:pos>418135.037 5715705.565</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_bbf8f9d9-0d88-468e-8fb6-a24670e6bf03"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418252.691 5715908.958</gml:lowerCorner> - <gml:upperCorner>418252.691 5715908.958</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_435cdbf0-8eba-43c0-9293-0e0417ed790b"> - <gml:pos>418252.691 5715908.958</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_bd2d8840-76c8-48c1-a7c9-254951cbfbd1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418088.791 5715911.953</gml:lowerCorner> - <gml:upperCorner>418088.791 5715911.953</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_1e674bfe-ba4e-4abd-8ab2-da140516ba57"> - <gml:pos>418088.791 5715911.953</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_bd8f47ff-35e7-46b6-ad2b-2abb6dfac19e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418266.595 5715920.821</gml:lowerCorner> - <gml:upperCorner>418266.595 5715920.821</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_4dc2a4fb-c13e-4244-a2c4-d946fbbca627"> - <gml:pos>418266.595 5715920.821</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_be129262-4134-4367-9499-73b9fdca6a1f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417979.871 5715821.176</gml:lowerCorner> - <gml:upperCorner>417979.871 5715821.176</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c63f2ed7-fda6-4103-9990-7b38151cbcdc"> - <gml:pos>417979.871 5715821.176</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_c1138427-e2df-4b19-80dd-e9d3115c62a5"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418405.887 5715802.518</gml:lowerCorner> - <gml:upperCorner>418405.887 5715802.518</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_63b941f4-14f7-4c18-b770-5282f8492081"> - <gml:pos>418405.887 5715802.518</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_c2c14b09-3cd1-4012-8a32-b454b7964f72"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418371.559 5716017.624</gml:lowerCorner> - <gml:upperCorner>418371.559 5716017.624</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_2d30d7e2-7d2a-4c8d-98f1-e6ee9b634a68"> - <gml:pos>418371.559 5716017.624</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_c395b8ba-961c-49ed-ab16-1f8cf44428fb"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417960.347 5715874.712</gml:lowerCorner> - <gml:upperCorner>417960.347 5715874.712</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9427e24b-147e-4620-84cb-9c82951628f9"> - <gml:pos>417960.347 5715874.712</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_c8ce1f8d-b2bb-4916-ab1d-902db4327363"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417964.238 5715872.117</gml:lowerCorner> - <gml:upperCorner>417964.238 5715872.117</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_a1ee78d8-24ec-4a8b-acfb-aa8ca7bf0f08"> - <gml:pos>417964.238 5715872.117</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_c95b37a4-c92f-4826-9122-92692dfb0e84"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418002.262 5715897.203</gml:lowerCorner> - <gml:upperCorner>418002.262 5715897.203</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_5d7ce355-a75f-4cc2-ae35-7e5d97bd6872"> - <gml:pos>418002.262 5715897.203</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_c9757827-30e4-466b-988f-24a51099a868"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418333.367 5715915.247</gml:lowerCorner> - <gml:upperCorner>418333.367 5715915.247</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_2c0e27b2-ca8d-4ced-8b59-1dcf4c47cd3a"> - <gml:pos>418333.367 5715915.247</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_cb1b46b8-de82-4688-91b7-d2acf20b1ccf"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418431.747 5715933.176</gml:lowerCorner> - <gml:upperCorner>418431.747 5715933.176</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ad3ca2ac-1e48-475f-bf92-2a23b697cefb"> - <gml:pos>418431.747 5715933.176</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_cb8742c8-ff0e-41d0-b894-17e85761684b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417976.998 5715874.194</gml:lowerCorner> - <gml:upperCorner>417976.998 5715874.194</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_ec06f70b-73d3-4558-b415-37e20d2837b4"> - <gml:pos>417976.998 5715874.194</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_cb961cc0-f6e4-491a-b245-93465744a429"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417992.68 5715877.085</gml:lowerCorner> - <gml:upperCorner>417992.68 5715877.085</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_b6c7c30d-59ea-474a-b571-7d0bd78720db"> - <gml:pos>417992.68 5715877.085</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_cc81d843-b4b7-4861-99db-12d97b6f1aa2"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418402.618 5715793.053</gml:lowerCorner> - <gml:upperCorner>418402.618 5715793.053</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_09571ba0-6c5b-4c67-a139-6f3f8a1c66ce"> - <gml:pos>418402.618 5715793.053</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_ce1c5093-cd65-4699-aa34-5024811a29d8"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418154.306 5715690.755</gml:lowerCorner> - <gml:upperCorner>418154.306 5715690.755</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_7415ae82-f9d9-49bf-9b94-5109fc10b986"> - <gml:pos>418154.306 5715690.755</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_d02b9544-ddf9-4f42-8a50-1cb79ee9f3ad"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418291.036 5715877.726</gml:lowerCorner> - <gml:upperCorner>418291.036 5715877.726</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_46e0a8ed-04c8-436a-b254-f9b257e7f6c8"> - <gml:pos>418291.036 5715877.726</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_d12f720c-a3bf-4fa3-8ba9-a8c4b67dda74"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418391.817 5715935.822</gml:lowerCorner> - <gml:upperCorner>418391.817 5715935.822</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_93fd83c4-bfe0-4129-955a-4bf4f0cc6d60"> - <gml:pos>418391.817 5715935.822</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_d732dbfa-e701-4b8c-af3b-2cdda0e8eb0c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418223.361 5715902.01</gml:lowerCorner> - <gml:upperCorner>418223.361 5715902.01</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0a6bb864-76a7-48ce-b307-dfbcf5a8a3f3"> - <gml:pos>418223.361 5715902.01</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_d84e4008-38ba-4280-b2e3-986b788194ef"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417963.404 5715868.853</gml:lowerCorner> - <gml:upperCorner>417963.404 5715868.853</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_429c1889-ef4a-4495-aa5b-a9186e2115ec"> - <gml:pos>417963.404 5715868.853</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_dae6071e-cc08-4e85-99e1-f82727b00ce1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418315.433 5716005.742</gml:lowerCorner> - <gml:upperCorner>418315.433 5716005.742</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_21cd55a2-0238-4435-95a0-04222889d723"> - <gml:pos>418315.433 5716005.742</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_dbb3b41c-ac54-4360-bd29-0e1ac6a201f7"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418378.561 5716005.403</gml:lowerCorner> - <gml:upperCorner>418378.561 5716005.403</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_41715a0c-a2e8-425a-bdf4-31409037bb5b"> - <gml:pos>418378.561 5716005.403</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_dc2b2597-748e-4028-b3d5-fe8e904f60cf"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418161.069 5715704.817</gml:lowerCorner> - <gml:upperCorner>418161.069 5715704.817</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0805ef6f-3f47-4e77-b105-8d24eae969d6"> - <gml:pos>418161.069 5715704.817</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_e43ed2d0-aaf2-41df-8f7e-9fede134320c"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418281.841 5715915.932</gml:lowerCorner> - <gml:upperCorner>418281.841 5715915.932</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9b65beb9-e040-4d39-ae96-c12d6aa9fc59"> - <gml:pos>418281.841 5715915.932</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_e4941205-340e-40dd-8da0-34df7257773b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418192.071 5715927.474</gml:lowerCorner> - <gml:upperCorner>418192.071 5715927.474</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_17fa5f8c-5f38-47ac-a532-7fb5e1721eea"> - <gml:pos>418192.071 5715927.474</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_e6336729-505a-424c-9c67-92234a3edf66"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418409.926 5715787.474</gml:lowerCorner> - <gml:upperCorner>418409.926 5715787.474</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_abd3c081-2842-4b25-ac77-a6b9e599aa42"> - <gml:pos>418409.926 5715787.474</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_e90d005c-1784-4ec1-b8d0-55aa74533f68"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418368.677 5716018.548</gml:lowerCorner> - <gml:upperCorner>418368.677 5716018.548</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_d9fceb3a-1a2c-47aa-b2cd-bebdf2019e2c"> - <gml:pos>418368.677 5716018.548</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_e91e85f2-3fab-484d-85ad-46726fdba456"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418501.586 5715928.458</gml:lowerCorner> - <gml:upperCorner>418501.586 5715928.458</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_590326d2-7b90-4805-8afe-c67cc6319f5b"> - <gml:pos>418501.586 5715928.458</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_ea228a89-c998-471f-aeb9-7159417f53ce"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418357.271 5715967.3</gml:lowerCorner> - <gml:upperCorner>418357.271 5715967.3</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_6cc7e537-9a20-43aa-9ae8-2a6e8d58e55d"> - <gml:pos>418357.271 5715967.3</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_eaedf54f-cc44-44c9-8d44-75da3cc5f61f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418213.768 5715899.637</gml:lowerCorner> - <gml:upperCorner>418213.768 5715899.637</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_5b9b9d16-1c1b-42b6-929d-2b93cf253071"> - <gml:pos>418213.768 5715899.637</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_eafd7afd-859d-44a8-a171-f2544cba8e1f"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418411.33 5715784.127</gml:lowerCorner> - <gml:upperCorner>418411.33 5715784.127</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c4af9ca7-87db-4322-8824-cf197373a419"> - <gml:pos>418411.33 5715784.127</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_edc32c31-877a-450a-a348-aadace42329e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418276.5 5715922.627</gml:lowerCorner> - <gml:upperCorner>418276.5 5715922.627</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_9a321ea1-4030-460d-9a36-7b18af9698d7"> - <gml:pos>418276.5 5715922.627</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_ee4bb02d-f023-4733-8b35-ee1cc05ece38"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417994.899 5715893.979</gml:lowerCorner> - <gml:upperCorner>417994.899 5715893.979</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_58af3761-75e1-48f4-a265-cab39b44ddc0"> - <gml:pos>417994.899 5715893.979</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_eef4c02e-8719-49fd-b97b-c30811a6cc38"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418095.566 5715932.679</gml:lowerCorner> - <gml:upperCorner>418095.566 5715932.679</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_0d7cee00-f125-45f7-9151-b733fa9c246f"> - <gml:pos>418095.566 5715932.679</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_f13638c7-2b81-469b-b7c2-21b974eab936"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418330.383 5715927.515</gml:lowerCorner> - <gml:upperCorner>418330.383 5715927.515</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_b847daaa-cd49-4d6b-a5bd-a376b4202b1e"> - <gml:pos>418330.383 5715927.515</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_f186d157-3b6a-42e0-9dc5-221de5b3f8a1"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418495.355 5715919.836</gml:lowerCorner> - <gml:upperCorner>418495.355 5715919.836</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_350f0161-0a78-45d4-9440-707f41d5afc5"> - <gml:pos>418495.355 5715919.836</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_f22288e3-3443-448e-9aa9-8b7542fa82fe"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417986.368 5715949.401</gml:lowerCorner> - <gml:upperCorner>417986.368 5715949.401</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_78ae58b6-9925-4882-b2cf-c06711225636"> - <gml:pos>417986.368 5715949.401</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_f2550c58-534c-4a9a-8e52-d9611d488f3b"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418392.116 5715748.786</gml:lowerCorner> - <gml:upperCorner>418392.116 5715748.786</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_031b9c18-987f-4741-bafb-35b22a0dc284"> - <gml:pos>418392.116 5715748.786</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_f3086fc1-aaa1-470a-a379-dc8b1c5a44de"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417997.958 5715886.011</gml:lowerCorner> - <gml:upperCorner>417997.958 5715886.011</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_7e8338c5-2bdb-4655-9289-c405a73b96ff"> - <gml:pos>417997.958 5715886.011</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_f776be08-ed47-4546-88c3-b3a36f8af9ce"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418125.523 5715715.521</gml:lowerCorner> - <gml:upperCorner>418125.523 5715715.521</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_1369b52a-b6eb-4bb8-93b4-02c4e5463d34"> - <gml:pos>418125.523 5715715.521</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_fb8eafa9-1dd5-4944-970b-135633f18379"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417936.367 5715913.309</gml:lowerCorner> - <gml:upperCorner>417936.367 5715913.309</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_385b7c85-092e-48e1-8bcb-fc699ee37692"> - <gml:pos>417936.367 5715913.309</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_fc9577c8-6a67-424f-a404-2c02a8ab5614"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418059.012 5715888.642</gml:lowerCorner> - <gml:upperCorner>418059.012 5715888.642</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_733ba5c6-2cf8-47fb-b2a5-7d32c37a657a"> - <gml:pos>418059.012 5715888.642</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_PPO gml:id="FEATURE_fcf8b86a-fbb1-4953-bfac-e2016f604a1e"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>418185.054 5715708.441</gml:lowerCorner> - <gml:upperCorner>418185.054 5715708.441</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:stylesheetId>1</xplan:stylesheetId> - <xplan:darstellungsprioritaet>4200</xplan:darstellungsprioritaet> - <xplan:art>weitereZweckbestimmung2</xplan:art> - <xplan:position> - <gml:Point srsName="EPSG:25833" - gml:id="GEOMETRY_c9cb65c0-5534-467c-8225-580fb0d9bca3"> - <gml:pos>418185.054 5715708.441</gml:pos> - </gml:Point> - </xplan:position> - </xplan:XP_PPO> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_RasterplanBasis - gml:id="FEATURE_c2a83b1c-05f4-4dc0-a1b6-feb1a43328d6"> - <xplan:refScan> - <xplan:XP_ExterneReferenz> - <xplan:georefURL>B-Plan_Klingmuehl_Heideweg_Karte.tfw - </xplan:georefURL> - <xplan:art>PlanMitGeoreferenz</xplan:art> - <xplan:referenzName>B-Plan_Klingmuehl_Heideweg_Karte - </xplan:referenzName> - <xplan:referenzURL>B-Plan_Klingmuehl_Heideweg_Karte.tif - </xplan:referenzURL> - </xplan:XP_ExterneReferenz> - </xplan:refScan> - </xplan:XP_RasterplanBasis> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_0453f54f-620f-40d7-8c1b-d842c6291a6b"> - <xplan:schluessel>42</xplan:schluessel> - <xplan:gesetzlicheGrundlage>ABC</xplan:gesetzlicheGrundlage> - <xplan:text>Wiese</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_064f1353-312d-44c6-972f-297153141d2c"> - <xplan:text>Massnahmen zum Schutz, Pflege und Entwicklung von Natur - und Landschaft</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_0b246fc4-b6a3-47a5-a6ca-5903bbda629b"> - <xplan:text>begrünter Platz</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_0f870967-bd6f-4367-9150-8a255f0290ad"> - <gml:boundedBy> - <gml:Envelope srsName="EPSG:25833"> - <gml:lowerCorner>417921.386 5715677.826</gml:lowerCorner> - <gml:upperCorner>418523.944 5716033.278</gml:upperCorner> - </gml:Envelope> - </gml:boundedBy> - <xplan:gesetzlicheGrundlage>ABC</xplan:gesetzlicheGrundlage> - <xplan:refText> - <xplan:XP_ExterneReferenz> - <xplan:georefURL>B-Georef.pdf</xplan:georefURL> - <xplan:georefMimeType>application/pdf</xplan:georefMimeType> - <xplan:art>Dokument</xplan:art> - <xplan:informationssystemURL>http://InfoSys.de</xplan:informationssystemURL> - <xplan:referenzName>B-Plan_Klingmuehl_Heideweg_Text - </xplan:referenzName> - <xplan:referenzURL>B-Plan_Klingmuehl_Heideweg_Text.pdf - </xplan:referenzURL> - <xplan:referenzMimeType>application/pdf</xplan:referenzMimeType> - <xplan:beschreibung>test</xplan:beschreibung> - </xplan:XP_ExterneReferenz> - </xplan:refText> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_0fde98fa-ad8a-4294-a6e9-a765f9755bbd"> - <xplan:text>Bindung fuer Bepflanzung und Erhaltung von Baeumen, - Straeuchern u. Sonstiger Bepflanzung</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_2efa698d-93c2-48a9-a6df-9e60f9af3e15"> - <xplan:text>Bindung fuer Bepflanzung und Erhaltung von Baeumen, - Straeuchern u. Sonstiger Bepflanzung</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_6ddfef0e-cab6-425f-b8f7-ab3c8cd5c5a9"> - <xplan:text>Begleitgrün</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_71fb157b-8516-4302-9df5-0529c4c2f435"> - <xplan:text>Bindung fuer Bepflanzung und Erhaltung von Baeumen, - Straeuchern u. Sonstiger Bepflanzung</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_72f00249-d100-4ba9-9f41-3894894dfdf9"> - <xplan:text>Massnahmen zum Schutz, Pflege und Entwicklung von Natur - und Landschaft</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_780b0be0-4930-491a-8fee-0e4700b0879f"> - <xplan:text>Bindung fuer Bepflanzung und Erhaltung von Baeumen, - Straeuchern u. Sonstiger Bepflanzung</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_7bac4f20-c03f-4738-82e2-16ed131e8d7b"> - <xplan:text>Bindung fuer Bepflanzung und Erhaltung von Baeumen, - Straeuchern u. Sonstiger Bepflanzung</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_8c34d6e2-05e5-45cb-b3dd-3ce04b57131d"> - <xplan:text>Massnahmen zum Schutz, Pflege und Entwicklung von Natur - und Landschaft</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_8ffd4fdb-e436-461f-910d-a9678e57d2a6"> - <xplan:text>Trockenrasen</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_a48d31dd-161a-424b-b9b2-e03d0b7549ee"> - <xplan:text>Massnahmen zum Schutz, Pflege und Entwicklung von Natur - und Landschaft</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_ab22d995-5d6c-4b57-aa1b-1a0895ae40c2"> - <xplan:text>begrünter Platz</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_c6fc6a83-4367-4900-a495-b51e76e37fcb"> - <xplan:text>Massnahmen zum Schutz, Pflege und Entwicklung von Natur - und Landschaft</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> - <gml:featureMember> - <xplan:XP_TextAbschnitt gml:id="FEATURE_f446dbe2-5910-494a-88cb-b9766675b7b6"> - <xplan:text>Massnahmen zum Schutz, Pflege und Entwicklung von Natur - und Landschaft</xplan:text> - </xplan:XP_TextAbschnitt> - </gml:featureMember> -</xplan:XPlanAuszug> diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BP2070-storedQuery-3000.zip b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BP2070-storedQuery-3000.zip deleted file mode 100644 index a63122c7ffbcdce0adb8e7e0282949d8771d07d6..0000000000000000000000000000000000000000 Binary files a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BP2070-storedQuery-3000.zip and /dev/null differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BP2070-storedQuery.zip b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BP2070-storedQuery.zip deleted file mode 100644 index b9565dbb7c578036db7c6e652a98b5e9f8f8d3ca..0000000000000000000000000000000000000000 Binary files a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/BP2070-storedQuery.zip and /dev/null differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Demo-storedQuery-5000.zip b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Demo-storedQuery-5000.zip deleted file mode 100644 index 2212c342b1bf8ee8fc87707d26ec3e12e007454e..0000000000000000000000000000000000000000 Binary files a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Demo-storedQuery-5000.zip and /dev/null differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Demo-storedQuery.zip b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Demo-storedQuery.zip deleted file mode 100644 index b7b8e5a8250ff62ece26027a27508b4e4395f5dc..0000000000000000000000000000000000000000 Binary files a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Demo-storedQuery.zip and /dev/null differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-320.zip b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-320.zip deleted file mode 100644 index 086c6d3317d8b2f0eaaba9cc2a6f20504d401eaf..0000000000000000000000000000000000000000 Binary files a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-320.zip and /dev/null differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-Blankenese.zip b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-Blankenese.zip deleted file mode 100644 index c82bf00cf2513dd456cbed09dbde576f85588ed5..0000000000000000000000000000000000000000 Binary files a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-Blankenese.zip and /dev/null differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-newer-release-date.zip b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-newer-release-date.zip deleted file mode 100644 index c984c46de3dfe89f83f0dfca067853bfa7918207..0000000000000000000000000000000000000000 Binary files a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-newer-release-date.zip and /dev/null differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-older-release-date.zip b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-older-release-date.zip deleted file mode 100644 index 8429de2c0ae6b8d359b1e317e1e2f5295accc92b..0000000000000000000000000000000000000000 Binary files a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4-older-release-date.zip and /dev/null differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4_Senatsbplan.zip b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4_Senatsbplan.zip deleted file mode 100644 index 7d2365de8c96dea97ee5a9d11906e6998432f1db..0000000000000000000000000000000000000000 Binary files a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4_Senatsbplan.zip and /dev/null differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4_noCrs.zip b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4_noCrs.zip deleted file mode 100644 index a99192ea49bc820a621c06d55c96ef262d976000..0000000000000000000000000000000000000000 Binary files a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan41/Eidelstedt_4_V4_noCrs.zip and /dev/null differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/Demo.zip b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/Demo.zip deleted file mode 100644 index 13eafc49b12fcc09fd054268898bf609a6c28f5b..0000000000000000000000000000000000000000 Binary files a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan50/Demo.zip and /dev/null differ diff --git a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/BPlan002_5-3.zip b/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/BPlan002_5-3.zip deleted file mode 100644 index a7d89135f0231bc8eefdd68fe3c509461bb4cbc3..0000000000000000000000000000000000000000 Binary files a/xplan-tests/xplan-tests-resources/src/main/resources/de/latlon/xplan/xplan52/BPlan002_5-3.zip and /dev/null differ 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 8e8b65b7d70ea2263ca7d78ac17acc3df20122c9..4c747757ad6f9ee9086f29f4151dddb5daf6bec2 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 @@ -6080,6 +6080,93 @@ declare namespace xplan='http://www.deegree.org/xplanung/1/0'; </con:parameters> </con:config> </con:testStep> + <con:testStep type="httprequest" name="XPlanSynWFS PlanIdWithSrsName" id="b7d10365-bca3-44d3-8a77-ea9f97261080"> + <con:settings/> + <con:config method="GET" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="XPlanSynWFS PlanIdWithSrsName" 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#baseUrlServices}/xplansyn-wfs/services/xplansynwfs</con:endpoint> + <con:request/> + <con:assertion type="Valid HTTP Status Codes" id="801e8b11-7329-4cf3-bdad-a11ed56f57c5" name="Valid HTTP Status Codes"> + <con:configuration> + <codes>200</codes> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="XPath Match"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; +declare namespace xplan='http://www.deegree.org/xplanung/1/0'; + +//wfs:member/xplan:BP_Plan/xplan:xpPlanName="Eidelstedt4_SoapUI-XPlanDienste"</path> + <content>true</content> + <allowWildcards>false</allowWildcards> + <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences> + <ignoreComments>false</ignoreComments> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="srsName"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; +declare namespace xplan='http://www.deegree.org/xplanung/1/0'; +declare namespace gml='http://www.opengis.net/gml/3.2'; + +//wfs:member/xplan:BP_Plan/xplan:raeumlicherGeltungsbereich/gml:Polygon/@srsName</path> + <content>EPSG:25833</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>WFS</con:value> + <con:style>QUERY</con:style> + <con:default>WFS</con:default> + <con:path xsi:nil="true"/> + <con:description xsi:nil="true"/> + </con:parameter> + <con:parameter> + <con:name>request</con:name> + <con:value>GetFeature</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:parameter> + <con:name>version</con:name> + <con:value>2.0.0</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>StoredQuery_ID</con:name> + <con:value>urn:ogc:def:query:OGC-WFS::PlanId</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>planId</con:name> + <con:value>1234567890</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>srsName</con:name> + <con:value>EPSG:25833</con:value> + <con:style>QUERY</con:style> + </con:parameter> + </con:parameters> + </con:config> + </con:testStep> <con:testStep type="httprequest" name="XPlanSynWFS PlanName" id="cd1d7022-d0e3-491d-b5cb-d106c3da62ad"> <con:settings/> <con:config method="GET" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="XPlanSynWFS PlanName" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -6208,6 +6295,152 @@ count(//wfs:member)</path> </con:parameters> </con:config> </con:testStep> + <con:testStep type="httprequest" name="XPlanSynWFS PlanNameWithSrsName" id="e07fa37f-0b2a-4334-a147-1f15fadfb372"> + <con:settings/> + <con:config method="GET" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="XPlanSynWFS PlanNameWithSrsName" 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#baseUrlServices}/xplansyn-wfs/services/xplansynwfs</con:endpoint> + <con:request/> + <con:assertion type="Valid HTTP Status Codes" id="801e8b11-7329-4cf3-bdad-a11ed56f57c5" name="Valid HTTP Status Codes"> + <con:configuration> + <codes>200</codes> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="BP_Plan"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; +declare namespace xplan='http://www.deegree.org/xplanung/1/0'; + +//wfs:member/xplan:BP_Plan/xplan:xpPlanName="Eidelstedt4_SoapUI-XPlanDienste"</path> + <content>true</content> + <allowWildcards>false</allowWildcards> + <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences> + <ignoreComments>false</ignoreComments> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="BP_Bereich"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; +declare namespace xplan='http://www.deegree.org/xplanung/1/0'; + +//wfs:member/xplan:BP_Bereich/xplan:xpPlanName="Eidelstedt4_SoapUI-XPlanDienste"</path> + <content>true</content> + <allowWildcards>false</allowWildcards> + <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences> + <ignoreComments>false</ignoreComments> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="BP_GewaesserFlaeche"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; +declare namespace xplan='http://www.deegree.org/xplanung/1/0'; + +//wfs:member/xplan:BP_GewaesserFlaeche/xplan:xpPlanName="Eidelstedt4_SoapUI-XPlanDienste"</path> + <content>true</content> + <allowWildcards>false</allowWildcards> + <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences> + <ignoreComments>false</ignoreComments> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="XP_PPO"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; +declare namespace xplan='http://www.deegree.org/xplanung/1/0'; + +//wfs:member/xplan:XP_PPO/xplan:xpPlanName="Eidelstedt4_SoapUI-XPlanDienste"</path> + <content>true</content> + <allowWildcards>false</allowWildcards> + <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences> + <ignoreComments>false</ignoreComments> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="XP_PTO"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; +declare namespace xplan='http://www.deegree.org/xplanung/1/0'; + +//wfs:member/xplan:XP_PTO/xplan:xpPlanName="Eidelstedt4_SoapUI-XPlanDienste"</path> + <content>true</content> + <allowWildcards>false</allowWildcards> + <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences> + <ignoreComments>false</ignoreComments> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="8691b5b9-6c15-473f-b1bb-46af883fd260" name="XPath Match"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; + +count(//wfs:member)</path> + <content>56</content> + <allowWildcards>false</allowWildcards> + <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences> + <ignoreComments>false</ignoreComments> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="8691b5b9-6c15-473f-b1bb-46af883fd260" name="srsName"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; +declare namespace xplan='http://www.deegree.org/xplanung/1/0'; +declare namespace gml='http://www.opengis.net/gml/3.2'; + +//wfs:member/xplan:BP_Plan/xplan:raeumlicherGeltungsbereich/gml:Polygon/@srsName</path> + <content>EPSG:25833</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>WFS</con:value> + <con:style>QUERY</con:style> + <con:default>WFS</con:default> + <con:path xsi:nil="true"/> + <con:description xsi:nil="true"/> + </con:parameter> + <con:parameter> + <con:name>request</con:name> + <con:value>GetFeature</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:parameter> + <con:name>version</con:name> + <con:value>2.0.0</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>StoredQuery_ID</con:name> + <con:value>urn:ogc:def:query:OGC-WFS::PlanName</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>planName</con:name> + <con:value>Eidelstedt4_SoapUI-XPlanDienste</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>srsName</con:name> + <con:value>EPSG:25833</con:value> + <con:style>QUERY</con:style> + </con:parameter> + </con:parameters> + </con:config> + </con:testStep> <con:testStep type="httprequest" name="XPlanSynWFS PlanNameAndType" id="59497d67-9a1d-4d63-bf0d-0765928c85cd"> <con:settings/> <con:config method="GET" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="XPlanSynWFS PlanNameAndType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -10056,6 +10289,97 @@ count(//wfs:member)</path> </con:parameters> </con:config> </con:testStep> + <con:testStep type="httprequest" name="XPlanWFS PlanIdWithSrsName" id="a4499df1-9d57-458e-bdf8-6f40ee3f933a"> + <con:settings/> + <con:config method="GET" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="XPlanWFS PlanIdWithSrsName" 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#baseUrlServices}/xplan-wfs/services/wfs41</con:endpoint> + <con:request/> + <con:assertion type="Valid HTTP Status Codes" id="801e8b11-7329-4cf3-bdad-a11ed56f57c5" name="Valid HTTP Status Codes"> + <con:configuration> + <codes>200</codes> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="XPath Match"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; + +count(//wfs:member)</path> + <content>56</content> + <allowWildcards>false</allowWildcards> + <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences> + <ignoreComments>false</ignoreComments> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="srsName"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; +declare namespace xplan='http://www.xplanung.de/xplangml/4/1'; +declare namespace gml='http://www.opengis.net/gml/3.2'; + +//wfs:member/xplan:BP_Plan/xplan:raeumlicherGeltungsbereich/gml:Polygon/@srsName</path> + <content>EPSG:25833</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>WFS</con:value> + <con:style>QUERY</con:style> + <con:default>WFS</con:default> + <con:path xsi:nil="true"/> + <con:description xsi:nil="true"/> + </con:parameter> + <con:parameter> + <con:name>request</con:name> + <con:value>GetFeature</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:parameter> + <con:name>version</con:name> + <con:value>2.0.0</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>StoredQuery_ID</con:name> + <con:value>urn:ogc:def:query:OGC-WFS::PlanId</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>planId</con:name> + <con:value>1234567890</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>resolvedepth</con:name> + <con:value>*</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>srsName</con:name> + <con:value>EPSG:25833</con:value> + <con:style>QUERY</con:style> + </con:parameter> + </con:parameters> + </con:config> + </con:testStep> <con:testStep type="httprequest" name="XPlanWFS PlanName" id="84b89269-ad2c-4923-9f30-3fe0619d3d41"> <con:settings/> <con:config method="GET" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="XPlanWFS PlanName" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -10129,6 +10453,97 @@ count(//wfs:member)</path> </con:parameters> </con:config> </con:testStep> + <con:testStep type="httprequest" name="XPlanWFS PlanNameWithSrsName" id="63680044-e086-4907-ab71-3779a198d947"> + <con:settings/> + <con:config method="GET" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="XPlanWFS PlanNameWithSrsName" 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#baseUrlServices}/xplan-wfs/services/wfs41</con:endpoint> + <con:request/> + <con:assertion type="Valid HTTP Status Codes" id="801e8b11-7329-4cf3-bdad-a11ed56f57c5" name="Valid HTTP Status Codes"> + <con:configuration> + <codes>200</codes> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="XPath Match"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; + +count(//wfs:member)</path> + <content>56</content> + <allowWildcards>false</allowWildcards> + <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences> + <ignoreComments>false</ignoreComments> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="srsName"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; +declare namespace xplan='http://www.xplanung.de/xplangml/4/1'; +declare namespace gml='http://www.opengis.net/gml/3.2'; + +//wfs:member/xplan:BP_Plan/xplan:raeumlicherGeltungsbereich/gml:Polygon/@srsName</path> + <content>EPSG:25833</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>WFS</con:value> + <con:style>QUERY</con:style> + <con:default>WFS</con:default> + <con:path xsi:nil="true"/> + <con:description xsi:nil="true"/> + </con:parameter> + <con:parameter> + <con:name>request</con:name> + <con:value>GetFeature</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:parameter> + <con:name>version</con:name> + <con:value>2.0.0</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>StoredQuery_ID</con:name> + <con:value>urn:ogc:def:query:OGC-WFS::PlanName</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>planName</con:name> + <con:value>Eidelstedt4_SoapUI-XPlanDienste</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>resolvedepth</con:name> + <con:value>*</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>srsName</con:name> + <con:value>EPSG:25833</con:value> + <con:style>QUERY</con:style> + </con:parameter> + </con:parameters> + </con:config> + </con:testStep> <con:testStep type="httprequest" name="Delete Eidelstedt4V4-with-nummer-soapui-webservices.zip" id="861d01a2-de5f-473c-865e-a3a0b39a3627"> <con:settings/> <con:config method="DELETE" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="Delete Eidelstedt4V4-with-nummer-soapui-webservices.zip" mediaType="application/octet-stream" postQueryString="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -10477,6 +10892,97 @@ count(//wfs:member)</path> </con:parameters> </con:config> </con:testStep> + <con:testStep type="httprequest" name="XPlanWFS PlanNameWithSrsName" id="5aa350c8-8a7c-415d-9045-36c4fd0cf496"> + <con:settings/> + <con:config method="GET" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="XPlanWFS PlanNameWithSrsName" 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#baseUrlServices}/xplan-wfs/services/wfs60archive</con:endpoint> + <con:request/> + <con:assertion type="Valid HTTP Status Codes" id="801e8b11-7329-4cf3-bdad-a11ed56f57c5" name="Valid HTTP Status Codes"> + <con:configuration> + <codes>200</codes> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="XPath Match"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; + +count(//wfs:member)</path> + <content>75</content> + <allowWildcards>false</allowWildcards> + <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences> + <ignoreComments>false</ignoreComments> + </con:configuration> + </con:assertion> + <con:assertion type="XPath Match" id="e42e211d-78d0-403e-b5d4-07669de8af80" name="srsName"> + <con:configuration> + <path>declare namespace wfs='http://www.opengis.net/wfs/2.0'; +declare namespace xplan='http://www.xplanung.de/xplangml/6/0'; +declare namespace gml='http://www.opengis.net/gml/3.2'; + +//wfs:member/xplan:BP_Plan/xplan:raeumlicherGeltungsbereich/gml:MultiSurface/@srsName</path> + <content>EPSG:25833</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>WFS</con:value> + <con:style>QUERY</con:style> + <con:default>WFS</con:default> + <con:path xsi:nil="true"/> + <con:description xsi:nil="true"/> + </con:parameter> + <con:parameter> + <con:name>request</con:name> + <con:value>GetFeature</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:parameter> + <con:name>version</con:name> + <con:value>2.0.0</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>StoredQuery_ID</con:name> + <con:value>urn:ogc:def:query:OGC-WFS::PlanName</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>planName</con:name> + <con:value>Osdorf48_Testplan_60_SoapUI-XPlanDienste</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>resolvedepth</con:name> + <con:value>*</con:value> + <con:style>QUERY</con:style> + </con:parameter> + <con:parameter> + <con:name>srsName</con:name> + <con:value>EPSG:25833</con:value> + <con:style>QUERY</con:style> + </con:parameter> + </con:parameters> + </con:config> + </con:testStep> <con:testStep type="httprequest" name="Delete Osdorf48_Test_60" id="9c901ac2-0c86-47ff-a8d6-cf538a9fe450"> <con:settings/> <con:config method="DELETE" xsi:type="con:HttpRequest" id="81e086dd-d7e1-453d-b813-a19540c01243" name="Delete Osdorf48_Test_60" mediaType="application/octet-stream" postQueryString="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> diff --git a/xplan-validator/pom.xml b/xplan-validator/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..0f503329036f0945ea26a02deec67a9450873ed6 --- /dev/null +++ b/xplan-validator/pom.xml @@ -0,0 +1,20 @@ +<?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-validator</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>de.latlon.product.xplanbox</groupId> + <artifactId>xplanbox</artifactId> + <version>7.2-SNAPSHOT</version> + </parent> + + <modules> + <module>xplan-validator-api</module> + <module>xplan-validator-config</module> + <module>xplan-validator-web</module> + </modules> + +</project> \ No newline at end of file diff --git a/xplan-api/xplan-api-validator/.maven-dockerinclude b/xplan-validator/xplan-validator-api/.maven-dockerinclude similarity index 100% rename from xplan-api/xplan-api-validator/.maven-dockerinclude rename to xplan-validator/xplan-validator-api/.maven-dockerinclude diff --git a/xplan-api/xplan-api-validator/Dockerfile b/xplan-validator/xplan-validator-api/Dockerfile similarity index 100% rename from xplan-api/xplan-api-validator/Dockerfile rename to xplan-validator/xplan-validator-api/Dockerfile diff --git a/xplan-api/xplan-api-validator/pom.xml b/xplan-validator/xplan-validator-api/pom.xml similarity index 90% rename from xplan-api/xplan-api-validator/pom.xml rename to xplan-validator/xplan-validator-api/pom.xml index b1b3200ef6d72e62d1e418234128df3b5d0a271c..e80068c91d8424fa052bd8ac5dedca9198071efe 100755 --- a/xplan-api/xplan-api-validator/pom.xml +++ b/xplan-validator/xplan-validator-api/pom.xml @@ -1,12 +1,12 @@ <?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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <artifactId>xplan-api-validator</artifactId> + <artifactId>xplan-validator-api</artifactId> <packaging>war</packaging> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-api</artifactId> + <artifactId>xplan-validator</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -99,6 +99,34 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <failOnMissingWebXml>false</failOnMissingWebXml> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + <webResources> + <resource> + <directory>src/main/webapp</directory> + <includes> + <include>**/version.txt</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/webapp</directory> + <excludes> + <exclude>**/version.txt</exclude> + </excludes> + <filtering>false</filtering> + </resource> + </webResources> + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -116,7 +144,7 @@ <!-- xPlanBox --> <dependency> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-validator-core</artifactId> + <artifactId>xplan-core-validator</artifactId> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId> @@ -130,11 +158,11 @@ </dependency> <dependency> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-api-commons</artifactId> + <artifactId>xplan-core-api</artifactId> </dependency> <dependency> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-security</artifactId> + <artifactId>xplan-core-security</artifactId> <version>${project.version}</version> </dependency> <!-- XPlanung --> @@ -325,7 +353,6 @@ <id>docker</id> <properties> <docker-image.skip>false</docker-image.skip> - <docker-image.name>xplan-validator-api</docker-image.name> </properties> <dependencies> <dependency> <!-- to copy jmx exporter stuff from docker image --> diff --git a/xplan-api/xplan-api-validator/run.sh b/xplan-validator/xplan-validator-api/run.sh similarity index 100% rename from xplan-api/xplan-api-validator/run.sh rename to xplan-validator/xplan-validator-api/run.sh diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java b/xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java similarity index 100% rename from xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java rename to xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/ApplicationContext.java b/xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/config/ApplicationContext.java similarity index 100% rename from xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/ApplicationContext.java rename to xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/config/ApplicationContext.java diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/JerseyConfig.java b/xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/config/JerseyConfig.java similarity index 100% rename from xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/JerseyConfig.java rename to xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/config/JerseyConfig.java diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/ValidatorApiConfiguration.java b/xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/config/ValidatorApiConfiguration.java similarity index 100% rename from xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/config/ValidatorApiConfiguration.java rename to xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/config/ValidatorApiConfiguration.java diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/handler/ConfigHandler.java b/xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/handler/ConfigHandler.java similarity index 100% rename from xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/handler/ConfigHandler.java rename to xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/handler/ConfigHandler.java diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/handler/ValidationHandler.java b/xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/handler/ValidationHandler.java similarity index 100% rename from xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/handler/ValidationHandler.java rename to xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/handler/ValidationHandler.java diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/v1/DefaultApi.java b/xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/v1/DefaultApi.java similarity index 100% rename from xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/v1/DefaultApi.java rename to xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/v1/DefaultApi.java diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/v1/InfoApi.java b/xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/v1/InfoApi.java similarity index 100% rename from xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/v1/InfoApi.java rename to xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/v1/InfoApi.java diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/v1/Status.java b/xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/v1/Status.java similarity index 100% rename from xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/v1/Status.java rename to xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/v1/Status.java diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/v1/ValidateApi.java b/xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/v1/ValidateApi.java similarity index 100% rename from xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/v1/ValidateApi.java rename to xplan-validator/xplan-validator-api/src/main/java/de/latlon/xplanbox/api/validator/v1/ValidateApi.java diff --git a/xplan-api/xplan-api-validator/src/main/resources/application.properties b/xplan-validator/xplan-validator-api/src/main/resources/application.properties similarity index 95% rename from xplan-api/xplan-api-validator/src/main/resources/application.properties rename to xplan-validator/xplan-validator-api/src/main/resources/application.properties index f4c7f456f75c478960d23bfd55f6132473fd5efd..c61711929bd39effccbe39db5d81282158480aa2 100644 --- a/xplan-api/xplan-api-validator/src/main/resources/application.properties +++ b/xplan-validator/xplan-validator-api/src/main/resources/application.properties @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -server.servlet.context-path=/xplan-api-validator +server.servlet.context-path=/xplan-validator-api logging.level.root=warn logging.level.de.latlon=debug diff --git a/xplan-api/xplan-api-validator/src/main/resources/log4j2.yaml b/xplan-validator/xplan-validator-api/src/main/resources/log4j2.yaml similarity index 100% rename from xplan-api/xplan-api-validator/src/main/resources/log4j2.yaml rename to xplan-validator/xplan-validator-api/src/main/resources/log4j2.yaml diff --git a/xplan-api/xplan-api-validator/src/main/resources/xplanvalidator.yaml b/xplan-validator/xplan-validator-api/src/main/resources/xplanvalidator.yaml similarity index 100% rename from xplan-api/xplan-api-validator/src/main/resources/xplanvalidator.yaml rename to xplan-validator/xplan-validator-api/src/main/resources/xplanvalidator.yaml diff --git a/xplan-webapps/xplan-manager-web/src/main/webapp/version.txt b/xplan-validator/xplan-validator-api/src/main/webapp/xvalidator/version.txt similarity index 100% rename from xplan-webapps/xplan-manager-web/src/main/webapp/version.txt rename to xplan-validator/xplan-validator-api/src/main/webapp/xvalidator/version.txt diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/SpringBootAppTest.java b/xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/SpringBootAppTest.java similarity index 100% rename from xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/SpringBootAppTest.java rename to xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/SpringBootAppTest.java diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/config/ApplicationContextTest.java b/xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/config/ApplicationContextTest.java similarity index 100% rename from xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/config/ApplicationContextTest.java rename to xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/config/ApplicationContextTest.java diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/config/TestContext.java b/xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/config/TestContext.java similarity index 100% rename from xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/config/TestContext.java rename to xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/config/TestContext.java diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/handler/ConfigHandlerTest.java b/xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/handler/ConfigHandlerTest.java similarity index 100% rename from xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/handler/ConfigHandlerTest.java rename to xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/handler/ConfigHandlerTest.java diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/handler/ValidationHandlerTest.java b/xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/handler/ValidationHandlerTest.java similarity index 98% rename from xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/handler/ValidationHandlerTest.java rename to xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/handler/ValidationHandlerTest.java index c0a3e566d01b6e18b1e8656e868d31c02b491c26..0ed9cd6a7eed295c2f334fbe0826905fc9dec547 100644 --- a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/handler/ValidationHandlerTest.java +++ b/xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/handler/ValidationHandlerTest.java @@ -65,7 +65,7 @@ public class ValidationHandlerTest { @BeforeAll static void setupFakedWorkspace() throws IOException { - Path workspace = tempFolder.resolve("xplan-validator-wms-memory-workspace"); + Path workspace = tempFolder.resolve("xplan-webservices-validator-wms-memory-workspace"); Files.createDirectories(workspace); System.setProperty("DEEGREE_WORKSPACE_ROOT", workspace.getParent().toString()); } diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/DefaultApiTest.java b/xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/v1/DefaultApiTest.java similarity index 98% rename from xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/DefaultApiTest.java rename to xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/v1/DefaultApiTest.java index 67dddf01dc0cd9efab383e566635663a0f1c0898..d260bdf5bd88fa9e9dd9291aad7391b05340393f 100644 --- a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/DefaultApiTest.java +++ b/xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/v1/DefaultApiTest.java @@ -57,7 +57,7 @@ class DefaultApiTest extends JerseyTest { @BeforeAll static void setupFakedWorkspace() throws IOException { - Path workspace = tempFolder.resolve("xplan-validator-wms-memory-workspace"); + Path workspace = tempFolder.resolve("xplan-webservices-validator-wms-memory-workspace"); Files.createDirectories(workspace); System.setProperty("DEEGREE_WORKSPACE_ROOT", workspace.getParent().toString()); } diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/InfoApiTest.java b/xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/v1/InfoApiTest.java similarity index 100% rename from xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/InfoApiTest.java rename to xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/v1/InfoApiTest.java diff --git a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/ValidateApiTest.java b/xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/v1/ValidateApiTest.java similarity index 99% rename from xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/ValidateApiTest.java rename to xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/v1/ValidateApiTest.java index cac5dd6d620dbb412bbf8ed8f979dd4bcadec3c7..c08cfbd505cb3e721be11862a124c81b122ac7af 100644 --- a/xplan-api/xplan-api-validator/src/test/java/de/latlon/xplanbox/api/validator/v1/ValidateApiTest.java +++ b/xplan-validator/xplan-validator-api/src/test/java/de/latlon/xplanbox/api/validator/v1/ValidateApiTest.java @@ -72,7 +72,7 @@ public class ValidateApiTest extends JerseyTest { @BeforeAll static void setupFakedWorkspace() throws IOException { - Path workspace = tempFolder.resolve("xplan-validator-wms-memory-workspace"); + Path workspace = tempFolder.resolve("xplan-webservices-validator-wms-memory-workspace"); Files.createDirectories(workspace); System.setProperty("DEEGREE_WORKSPACE_ROOT", workspace.getParent().toString()); } diff --git a/xplan-api/xplan-api-validator/src/test/resources/bplan_valid_41.zip b/xplan-validator/xplan-validator-api/src/test/resources/bplan_valid_41.zip similarity index 100% rename from xplan-api/xplan-api-validator/src/test/resources/bplan_valid_41.zip rename to xplan-validator/xplan-validator-api/src/test/resources/bplan_valid_41.zip diff --git a/xplan-api/xplan-api-validator/src/test/resources/de/latlon/xplanbox/api/validator/v1/validatorApiConfiguration.properties b/xplan-validator/xplan-validator-api/src/test/resources/de/latlon/xplanbox/api/validator/v1/validatorApiConfiguration.properties similarity index 100% rename from xplan-api/xplan-api-validator/src/test/resources/de/latlon/xplanbox/api/validator/v1/validatorApiConfiguration.properties rename to xplan-validator/xplan-validator-api/src/test/resources/de/latlon/xplanbox/api/validator/v1/validatorApiConfiguration.properties diff --git a/xplan-api/xplan-api-validator/src/test/resources/log4j2-test.yaml b/xplan-validator/xplan-validator-api/src/test/resources/log4j2-test.yaml similarity index 100% rename from xplan-api/xplan-api-validator/src/test/resources/log4j2-test.yaml rename to xplan-validator/xplan-validator-api/src/test/resources/log4j2-test.yaml diff --git a/xplan-api/xplan-api-validator/src/test/resources/xplan.gml b/xplan-validator/xplan-validator-api/src/test/resources/xplan.gml similarity index 100% rename from xplan-api/xplan-api-validator/src/test/resources/xplan.gml rename to xplan-validator/xplan-validator-api/src/test/resources/xplan.gml diff --git a/xplan-configuration/xplan-validator-config/pom.xml b/xplan-validator/xplan-validator-config/pom.xml similarity index 52% rename from xplan-configuration/xplan-validator-config/pom.xml rename to xplan-validator/xplan-validator-config/pom.xml index dce75cebc160686c3b5e83d5098281391c81306e..e02934fef9cce6356ba59697c9eef4ddf3b7fb7d 100644 --- a/xplan-configuration/xplan-validator-config/pom.xml +++ b/xplan-validator/xplan-validator-config/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-configuration</artifactId> + <artifactId>xplan-validator</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -15,6 +15,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>zip</id> + <goals> + <goal>single</goal> + </goals> + <configuration> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <descriptors> + <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + <phase>package</phase> + </execution> + </executions> </plugin> </plugins> </build> diff --git a/xplan-configuration/xplan-validator-config/src/main/assembly/assembly.xml b/xplan-validator/xplan-validator-config/src/main/assembly/assembly.xml similarity index 100% rename from xplan-configuration/xplan-validator-config/src/main/assembly/assembly.xml rename to xplan-validator/xplan-validator-config/src/main/assembly/assembly.xml diff --git a/xplan-configuration/xplan-validator-config/src/main/resources/validatorApiConfiguration.properties b/xplan-validator/xplan-validator-config/src/main/resources/validatorApiConfiguration.properties similarity index 100% rename from xplan-configuration/xplan-validator-config/src/main/resources/validatorApiConfiguration.properties rename to xplan-validator/xplan-validator-config/src/main/resources/validatorApiConfiguration.properties diff --git a/xplan-configuration/xplan-validator-config/src/main/resources/validatorConfiguration.properties b/xplan-validator/xplan-validator-config/src/main/resources/validatorConfiguration.properties similarity index 100% rename from xplan-configuration/xplan-validator-config/src/main/resources/validatorConfiguration.properties rename to xplan-validator/xplan-validator-config/src/main/resources/validatorConfiguration.properties diff --git a/xplan-webapps/xplan-validator-web/Dockerfile b/xplan-validator/xplan-validator-web/Dockerfile similarity index 100% rename from xplan-webapps/xplan-validator-web/Dockerfile rename to xplan-validator/xplan-validator-web/Dockerfile diff --git a/xplan-webapps/xplan-validator-web/pom.xml b/xplan-validator/xplan-validator-web/pom.xml similarity index 96% rename from xplan-webapps/xplan-validator-web/pom.xml rename to xplan-validator/xplan-validator-web/pom.xml index 64f7fc65e7ffcf4b6069f2f7ebe5fa378e941f03..c9e45fcfcf893b6ed0ba308365ba0232473de1b6 100644 --- a/xplan-webapps/xplan-validator-web/pom.xml +++ b/xplan-validator/xplan-validator-web/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-webapps</artifactId> + <artifactId>xplan-validator</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -175,20 +175,16 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons</artifactId> + <artifactId>xplan-core-commons</artifactId> <classifier>sources</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons-web</artifactId> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>xplan-validator-core</artifactId> + <artifactId>xplan-core-validator</artifactId> <exclusions> <exclusion> <groupId>org.eclipse.jdt.core.compiler</groupId> @@ -207,7 +203,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-validator-web-commons</artifactId> + <artifactId>xplan-core-gwt</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>xplan-core-gwt</artifactId> + <classifier>sources</classifier> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/UploadFinishedDialogBox.java b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/UploadFinishedDialogBox.java similarity index 89% rename from xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/UploadFinishedDialogBox.java rename to xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/UploadFinishedDialogBox.java index d32d5cffa7bd6eaec3b005b2cdfef152dc2f9080..6f3aa368d1b2db09080eab41443223e89b2a907f 100644 --- a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/UploadFinishedDialogBox.java +++ b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/UploadFinishedDialogBox.java @@ -32,12 +32,14 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.VerticalPanel; -import de.latlon.xplan.validator.web.client.report.ReportDownloadFinishedListener; -import de.latlon.xplan.validator.web.client.service.ValidationConfigService; -import de.latlon.xplan.validator.web.client.service.ValidationConfigServiceAsync; -import de.latlon.xplan.validator.web.shared.ValidationConfig; - -import static de.latlon.xplan.validator.web.client.report.ReportDownloadFinishedListener.FinishStatus.NEXT; +import de.latlon.xplanbox.core.gwt.commons.client.ValidatorOptionsDialog; +import de.latlon.xplanbox.core.gwt.commons.client.ValidatorWebCommonsMessages; +import de.latlon.xplanbox.core.gwt.commons.client.report.ReportDownloadFinishedListener; +import de.latlon.xplanbox.core.gwt.commons.client.service.ValidationConfigService; +import de.latlon.xplanbox.core.gwt.commons.client.service.ValidationConfigServiceAsync; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationConfig; + +import static de.latlon.xplanbox.core.gwt.commons.client.report.ReportDownloadFinishedListener.FinishStatus.NEXT; /** * Extends the {@link DialogBox} with a button to close the dialog diff --git a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/XPlanValidatorWeb.java b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/XPlanValidatorWeb.java similarity index 99% rename from xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/XPlanValidatorWeb.java rename to xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/XPlanValidatorWeb.java index a796e18a8e13097069c48755749a3585766ef2c2..778457c3e8929dedcf06ef9964b57788329dd2b8 100644 --- a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/XPlanValidatorWeb.java +++ b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/XPlanValidatorWeb.java @@ -37,7 +37,7 @@ import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.VerticalPanel; -import de.latlon.xplan.commons.web.CloseableDialogBox; +import de.latlon.xplanbox.core.gwt.commons.web.CloseableDialogBox; /** * Entry point of the validation, containing the file upload and a button to navigate to diff --git a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/XPlanValidatorWebMessages.java b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/XPlanValidatorWebMessages.java similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/XPlanValidatorWebMessages.java rename to xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/client/XPlanValidatorWebMessages.java diff --git a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/PlanArchiveManager.java b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/PlanArchiveManager.java similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/PlanArchiveManager.java rename to xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/PlanArchiveManager.java diff --git a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/ValidatorMapPreviewConfigService.java b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/ValidatorMapPreviewConfigService.java similarity index 95% rename from xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/ValidatorMapPreviewConfigService.java rename to xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/ValidatorMapPreviewConfigService.java index 1d881f0d34715becee44fa85e8c1836b25f7837e..917fc250553c6ba269498cc813d83feec0b30934 100644 --- a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/ValidatorMapPreviewConfigService.java +++ b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/ValidatorMapPreviewConfigService.java @@ -24,8 +24,8 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; import com.google.gwt.user.server.rpc.RemoteServiceServlet; import de.latlon.xplan.manager.web.shared.XPlan; import de.latlon.xplan.validator.ValidatorException; -import de.latlon.xplan.validator.web.client.service.MapPreviewConfigService; -import de.latlon.xplan.validator.web.shared.MapPreviewException; +import de.latlon.xplanbox.core.gwt.commons.client.service.MapPreviewConfigService; +import de.latlon.xplanbox.core.gwt.commons.shared.MapPreviewException; import de.latlon.xplan.validator.web.shared.MapPreviewMetadata; import de.latlon.xplan.validator.wms.MapPreviewCreationException; import de.latlon.xplan.validator.wms.MapPreviewManager; diff --git a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/ValidatorReportProvider.java b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/ValidatorReportProvider.java similarity index 97% rename from xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/ValidatorReportProvider.java rename to xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/ValidatorReportProvider.java index b17dc0580e76473509fe67a6c51c6b26011f2845..b5c52cd137f224ef329f4451c3e70b7ae0f76584 100644 --- a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/ValidatorReportProvider.java +++ b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/ValidatorReportProvider.java @@ -20,6 +20,7 @@ */ package de.latlon.xplan.validator.web.server.service; +import de.latlon.xplanbox.core.gwt.commons.server.service.ReportProvider; import de.latlon.xplan.validator.report.ReportWriter; import de.latlon.xplan.validator.web.shared.ArtifactType; import org.springframework.beans.factory.annotation.Autowired; diff --git a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/XPlanUploadService.java b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/XPlanUploadService.java similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/XPlanUploadService.java rename to xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/XPlanUploadService.java diff --git a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/XPlanValidationServiceImpl.java b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/XPlanValidationServiceImpl.java similarity index 92% rename from xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/XPlanValidationServiceImpl.java rename to xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/XPlanValidationServiceImpl.java index df9aadfdb3adccb33f2dd91ba512ab0ac3ca82d4..4c8cb8f3f6cf101d9eeb99657a50c5afdb641ab0 100644 --- a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/XPlanValidationServiceImpl.java +++ b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/server/service/XPlanValidationServiceImpl.java @@ -21,16 +21,17 @@ package de.latlon.xplan.validator.web.server.service; import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import de.latlon.xplanbox.core.gwt.commons.server.service.ValidationUtils; import de.latlon.xplan.manager.web.shared.XPlan; import de.latlon.xplan.validator.ValidatorException; import de.latlon.xplan.validator.XPlanValidator; import de.latlon.xplan.validator.report.ReportWriter; import de.latlon.xplan.validator.report.ValidatorReport; -import de.latlon.xplan.validator.web.client.service.ValidationService; -import de.latlon.xplan.validator.web.shared.InvalidParameterException; -import de.latlon.xplan.validator.web.shared.ValidationException; +import de.latlon.xplanbox.core.gwt.commons.client.service.ValidationService; +import de.latlon.xplanbox.core.gwt.commons.shared.InvalidParameterException; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationException; import de.latlon.xplan.validator.web.shared.ValidationSettings; -import de.latlon.xplan.validator.web.shared.ValidationSummary; +import de.latlon.xplanbox.core.gwt.commons.shared.ValidationSummary; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/spring/config/XPlanValidatorWebContextConfig.java b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/spring/config/XPlanValidatorWebContextConfig.java similarity index 93% rename from xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/spring/config/XPlanValidatorWebContextConfig.java rename to xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/spring/config/XPlanValidatorWebContextConfig.java index 60b80ed995b9432c0c88f7ce4554f2ef31ff525f..61078fc4270dc7209e7b30161597d7f667999d99 100644 --- a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/spring/config/XPlanValidatorWebContextConfig.java +++ b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/spring/config/XPlanValidatorWebContextConfig.java @@ -31,7 +31,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; */ @Configuration @EnableWebMvc -@ComponentScan(basePackages = { "de.latlon.xplan.validator.web.server.service" }) +@ComponentScan(basePackages = { "de.latlon.xplanbox.core.gwt.commons.server.service" }) public class XPlanValidatorWebContextConfig { } diff --git a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/spring/config/XPlanValidatorWebSpringConfig.java b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/spring/config/XPlanValidatorWebSpringConfig.java similarity index 99% rename from xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/spring/config/XPlanValidatorWebSpringConfig.java rename to xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/spring/config/XPlanValidatorWebSpringConfig.java index 1d45b49610c2b40144a899f671408d016722102f..6ec6a0caa4948118c95634e7b640db386c4caa4e 100644 --- a/xplan-webapps/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/spring/config/XPlanValidatorWebSpringConfig.java +++ b/xplan-validator/xplan-validator-web/src/main/java/de/latlon/xplan/validator/web/spring/config/XPlanValidatorWebSpringConfig.java @@ -39,7 +39,7 @@ import de.latlon.xplan.validator.semantic.profile.SemanticProfilesCreator; 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.xplan.validator.web.server.service.ReportProvider; +import de.latlon.xplanbox.core.gwt.commons.server.service.ReportProvider; import de.latlon.xplan.validator.web.server.service.ValidatorReportProvider; import de.latlon.xplan.validator.wms.MapPreviewCreationException; import de.latlon.xplan.validator.wms.MapPreviewManager; diff --git a/xplan-webapps/xplan-validator-web/src/main/resources/de/latlon/xplan/validator/web/XPlanValidatorWeb.gwt.xml b/xplan-validator/xplan-validator-web/src/main/resources/de/latlon/xplan/validator/web/XPlanValidatorWeb.gwt.xml similarity index 92% rename from xplan-webapps/xplan-validator-web/src/main/resources/de/latlon/xplan/validator/web/XPlanValidatorWeb.gwt.xml rename to xplan-validator/xplan-validator-web/src/main/resources/de/latlon/xplan/validator/web/XPlanValidatorWeb.gwt.xml index 908de2198b7e784d31237473185cd9849373f398..a0a62b1935183bdde2cddb90c41d78776d98b87a 100644 --- a/xplan-webapps/xplan-validator-web/src/main/resources/de/latlon/xplan/validator/web/XPlanValidatorWeb.gwt.xml +++ b/xplan-validator/xplan-validator-web/src/main/resources/de/latlon/xplan/validator/web/XPlanValidatorWeb.gwt.xml @@ -39,8 +39,9 @@ <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> --> <!-- Other module inherits --> - <inherits name='de.latlon.xplan.commons.XPlanCommonsWeb'/> - <inherits name='de.latlon.xplan.validator.web.XPlanValidatorWebCommons'/> + <inherits name='de.latlon.xplan.manager.XPlanManagerCore'/> + <inherits name='de.latlon.xplan.validator.XPlanValidatorCore'/> + <inherits name='de.latlon.xplanbox.core.gwt.commons.XPlanCommons'/> <!-- Specify the app entry point class. --> diff --git a/xplan-webapps/xplan-validator-web/src/main/resources/de/latlon/xplan/validator/web/client/XPlanValidatorWebMessages.properties b/xplan-validator/xplan-validator-web/src/main/resources/de/latlon/xplan/validator/web/client/XPlanValidatorWebMessages.properties similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/resources/de/latlon/xplan/validator/web/client/XPlanValidatorWebMessages.properties rename to xplan-validator/xplan-validator-web/src/main/resources/de/latlon/xplan/validator/web/client/XPlanValidatorWebMessages.properties diff --git a/xplan-webapps/xplan-validator-web/src/main/resources/log4j2.yaml b/xplan-validator/xplan-validator-web/src/main/resources/log4j2.yaml similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/resources/log4j2.yaml rename to xplan-validator/xplan-validator-web/src/main/resources/log4j2.yaml diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/WEB-INF/web.xml b/xplan-validator/xplan-validator-web/src/main/webapp/WEB-INF/web.xml similarity index 97% rename from xplan-webapps/xplan-validator-web/src/main/webapp/WEB-INF/web.xml rename to xplan-validator/xplan-validator-web/src/main/webapp/WEB-INF/web.xml index d71960d623844d1fd4811bd15e3c94a999ea98ed..0935ad07461274bed727e79c423669e30e1da593 100644 --- a/xplan-webapps/xplan-validator-web/src/main/webapp/WEB-INF/web.xml +++ b/xplan-validator/xplan-validator-web/src/main/webapp/WEB-INF/web.xml @@ -60,7 +60,7 @@ </servlet> <servlet> <servlet-name>xplanvalidatorwebValidationconfigService</servlet-name> - <servlet-class>de.latlon.xplan.validator.web.server.service.DefaultValidationConfigService</servlet-class> + <servlet-class>de.latlon.xplanbox.core.gwt.commons.server.service.DefaultValidationConfigService</servlet-class> </servlet> <servlet> <servlet-name>xplanvalidatorrest</servlet-name> diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/XPlanValidatorWeb.css b/xplan-validator/xplan-validator-web/src/main/webapp/XPlanValidatorWeb.css similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/XPlanValidatorWeb.css rename to xplan-validator/xplan-validator-web/src/main/webapp/XPlanValidatorWeb.css diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/favicon.ico b/xplan-validator/xplan-validator-web/src/main/webapp/favicon.ico similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/favicon.ico rename to xplan-validator/xplan-validator-web/src/main/webapp/favicon.ico diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/index.html b/xplan-validator/xplan-validator-web/src/main/webapp/index.html similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/index.html rename to xplan-validator/xplan-validator-web/src/main/webapp/index.html diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/latilong.png b/xplan-validator/xplan-validator-web/src/main/webapp/latilong.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/latilong.png rename to xplan-validator/xplan-validator-web/src/main/webapp/latilong.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/latlon_logo_schriftzug.png b/xplan-validator/xplan-validator-web/src/main/webapp/latlon_logo_schriftzug.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/latlon_logo_schriftzug.png rename to xplan-validator/xplan-validator-web/src/main/webapp/latlon_logo_schriftzug.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/License.txt b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/License.txt similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/License.txt rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/License.txt diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/config.js b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/config.js similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/config.js rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/config.js diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/config.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/config.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/config.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/config.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/config/services-internet.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/config/services-internet.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/config/services-internet.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/config/services-internet.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/masterportal.css b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/masterportal.css similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/masterportal.css rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/masterportal.css diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/style.css b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/style.css similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/style.css rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/style.css diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/VideoJS.eot b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/VideoJS.eot similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/VideoJS.eot rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/VideoJS.eot diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/bootstrap-icons.woff2 b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/bootstrap-icons.woff2 similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/bootstrap-icons.woff2 rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/bootstrap-icons.woff2 diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.eot b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.eot similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.eot rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.eot diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.ttf b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.ttf similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.ttf rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.ttf diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.woff b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.woff similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.woff rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.woff diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.woff2 b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.woff2 similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.woff2 rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/glyphicons-halflings-regular.woff2 diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/marker.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/marker.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/marker.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/marker.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.eot b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.eot similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.eot rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.eot diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.ttf b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.ttf similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.ttf rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.ttf diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.woff b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.woff similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.woff rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/master_touchtable_big.woff diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.eot b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.eot similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.eot rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.eot diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.ttf b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.ttf similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.ttf rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.ttf diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.woff b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.woff similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.woff rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.woff diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.woff2 b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.woff2 similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.woff2 rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-700.woff2 diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.eot b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.eot similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.eot rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.eot diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.ttf b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.ttf similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.ttf rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.ttf diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.woff b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.woff similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.woff rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.woff diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.woff2 b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.woff2 similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.woff2 rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-italic.woff2 diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.eot b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.eot similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.eot rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.eot diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.ttf b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.ttf similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.ttf rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.ttf diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.woff b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.woff similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.woff rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.woff diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.woff2 b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.woff2 similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.woff2 rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/css/woffs/roboto-regular.woff2 diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/Logo_Masterportal.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/Logo_Masterportal.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/Logo_Masterportal.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/Logo_Masterportal.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/ajax-loader.gif b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/ajax-loader.gif similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/ajax-loader.gif rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/ajax-loader.gif diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-center.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-center.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-center.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-center.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-east.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-east.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-east.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-east.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-north.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-north.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-north.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-north.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-pointer.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-pointer.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-pointer.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-pointer.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-rings.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-rings.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-rings.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-rings.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-south.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-south.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-south.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-south.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-west.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-west.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-west.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls-west.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/3d-controls.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/east-pointer.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/east-pointer.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/east-pointer.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/east-pointer.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/north-pointer.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/north-pointer.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/north-pointer.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/north-pointer.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-east-short.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-east-short.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-east-short.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-east-short.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-north-short.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-north-short.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-north-short.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-north-short.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-ost-short.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-ost-short.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-ost-short.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-ost-short.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-south-short.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-south-short.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-south-short.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-south-short.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-west-short.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-west-short.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-west-short.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/pointer-west-short.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/south-pointer.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/south-pointer.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/south-pointer.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/south-pointer.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/tilt-down.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/tilt-down.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/tilt-down.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/tilt-down.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/tilt-up.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/tilt-up.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/tilt-up.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/tilt-up.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/west-pointer.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/west-pointer.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/compass/west-pointer.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/compass/west-pointer.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/mapMarker.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/mapMarker.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/mapMarker.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/mapMarker.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_black.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_black.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_black.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_black.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_blue.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_blue.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_blue.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_blue.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_green.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_green.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_green.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_green.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_grey.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_grey.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_grey.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_grey.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_orange.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_orange.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_orange.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_orange.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_orange_big_opacity05.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_orange_big_opacity05.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_orange_big_opacity05.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_orange_big_opacity05.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_red.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_red.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_red.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_red.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_white.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_white.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_white.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_white.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_yellow.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_yellow.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_yellow.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/img/tools/draw/circle_yellow.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/index.html b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/index.html similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/index.html rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/index.html diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/js/masterportal.js b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/js/masterportal.js similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/js/masterportal.js rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/js/masterportal.js diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/de/common.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/de/common.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/de/common.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/de/common.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/en/common.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/en/common.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/en/common.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/en/common.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/es/common.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/es/common.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/es/common.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/es/common.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/it/common.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/it/common.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/it/common.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/it/common.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/platt/common.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/platt/common.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/platt/common.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/platt/common.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/pt/common.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/pt/common.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/pt/common.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/pt/common.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/ru/common.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/ru/common.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/ru/common.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/ru/common.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/tr/common.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/tr/common.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/tr/common.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/tr/common.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/ua/common.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/ua/common.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/locales/ua/common.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/locales/ua/common.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein_2.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein_2.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein_2.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein_2.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein_3.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein_3.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein_3.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein_3.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein_4.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein_4.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein_4.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/allgemein_4.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/backgroundCanvas.jpeg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/backgroundCanvas.jpeg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/backgroundCanvas.jpeg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/backgroundCanvas.jpeg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/berufliche_schulen.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/berufliche_schulen.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/berufliche_schulen.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/berufliche_schulen.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/br.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/br.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/br.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/br.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/fssa.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/fssa.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/fssa.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/fssa.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/grundschulen.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/grundschulen.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/grundschulen.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/grundschulen.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/gymnasien.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/gymnasien.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/gymnasien.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/gymnasien.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/krankenhaus.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/krankenhaus.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/krankenhaus.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/krankenhaus.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/langformschulen.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/langformschulen.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/langformschulen.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/langformschulen.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/mp_logo.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/mp_logo.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/mp_logo.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/mp_logo.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_1.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_1.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_1.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_1.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_10.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_10.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_10.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_10.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_11.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_11.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_11.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_11.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_12.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_12.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_12.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_12.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_13.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_13.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_13.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_13.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_14.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_14.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_14.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_14.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_15.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_15.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_15.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_15.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_16.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_16.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_16.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_16.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_2.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_2.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_2.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_2.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_3.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_3.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_3.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_3.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_4.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_4.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_4.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_4.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_5.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_5.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_5.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_5.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_6.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_6.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_6.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_6.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_7.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_7.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_7.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_7.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_8.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_8.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_8.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_8.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_9.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_9.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_9.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/routing_9.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/schule.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/schule.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/schule.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/schule.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/sfa.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/sfa.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/sfa.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/sfa.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/sonderschulen.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/sonderschulen.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/sonderschulen.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/sonderschulen.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/stadtteilschulen.svg b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/stadtteilschulen.svg similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/stadtteilschulen.svg rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/stadtteilschulen.svg diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/stp.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/stp.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/stp.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/stp.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/stpd.png b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/stpd.png similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/img/stpd.png rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/img/stpd.png diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/rest-services-internet.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/rest-services-internet.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/rest-services-internet.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/rest-services-internet.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/services-internet.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/services-internet.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/services-internet.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/services-internet.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/style_v3.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/style_v3.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/resources/style_v3.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/resources/style_v3.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/template/config.template.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/template/config.template.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/template/config.template.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/template/config.template.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/template/service.template.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/template/service.template.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/template/service.template.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/template/service.template.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/template/services-internet.template.json b/xplan-validator/xplan-validator-web/src/main/webapp/masterportal/template/services-internet.template.json similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/masterportal/template/services-internet.template.json rename to xplan-validator/xplan-validator-web/src/main/webapp/masterportal/template/services-internet.template.json diff --git a/xplan-webapps/xplan-validator-web/src/main/webapp/version.txt b/xplan-validator/xplan-validator-web/src/main/webapp/version.txt similarity index 100% rename from xplan-webapps/xplan-validator-web/src/main/webapp/version.txt rename to xplan-validator/xplan-validator-web/src/main/webapp/version.txt diff --git a/xplan-webapps/xplan-validator-web/src/test/java/de/latlon/xplan/validator/web/server/service/ReportControllerTest.java b/xplan-validator/xplan-validator-web/src/test/java/de/latlon/xplan/validator/web/server/service/ReportControllerTest.java similarity index 96% rename from xplan-webapps/xplan-validator-web/src/test/java/de/latlon/xplan/validator/web/server/service/ReportControllerTest.java rename to xplan-validator/xplan-validator-web/src/test/java/de/latlon/xplan/validator/web/server/service/ReportControllerTest.java index f0cb4d7851951f51d15fa6dd601df3148389b7b1..3687d868df4f8712c008d5b76bdad3557e9020d5 100644 --- a/xplan-webapps/xplan-validator-web/src/test/java/de/latlon/xplan/validator/web/server/service/ReportControllerTest.java +++ b/xplan-validator/xplan-validator-web/src/test/java/de/latlon/xplan/validator/web/server/service/ReportControllerTest.java @@ -20,6 +20,8 @@ */ package de.latlon.xplan.validator.web.server.service; +import de.latlon.xplanbox.core.gwt.commons.server.service.ReportController; +import de.latlon.xplanbox.core.gwt.commons.server.service.ReportProvider; import de.latlon.xplan.validator.web.spring.config.TestConfig; import de.latlon.xplan.validator.web.spring.config.XPlanValidatorWebContextConfig; import de.latlon.xplan.validator.web.spring.config.XPlanValidatorWebSpringConfig; diff --git a/xplan-webapps/xplan-validator-web/src/test/java/de/latlon/xplan/validator/web/spring/config/TestConfig.java b/xplan-validator/xplan-validator-web/src/test/java/de/latlon/xplan/validator/web/spring/config/TestConfig.java similarity index 95% rename from xplan-webapps/xplan-validator-web/src/test/java/de/latlon/xplan/validator/web/spring/config/TestConfig.java rename to xplan-validator/xplan-validator-web/src/test/java/de/latlon/xplan/validator/web/spring/config/TestConfig.java index 7d2f7319aa61887b1d9fb55f077906dc26cf70cd..8e684a49c01ab00902bed696c39e6472d2854a30 100644 --- a/xplan-webapps/xplan-validator-web/src/test/java/de/latlon/xplan/validator/web/spring/config/TestConfig.java +++ b/xplan-validator/xplan-validator-web/src/test/java/de/latlon/xplan/validator/web/spring/config/TestConfig.java @@ -20,7 +20,7 @@ */ package de.latlon.xplan.validator.web.spring.config; -import de.latlon.xplan.validator.web.server.service.ReportProvider; +import de.latlon.xplanbox.core.gwt.commons.server.service.ReportProvider; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/xplan-webapps/xplan-validator-web/src/test/resources/log4j2-test.yaml b/xplan-validator/xplan-validator-web/src/test/resources/log4j2-test.yaml similarity index 100% rename from xplan-webapps/xplan-validator-web/src/test/resources/log4j2-test.yaml rename to xplan-validator/xplan-validator-web/src/test/resources/log4j2-test.yaml diff --git a/xplan-webapps/pom.xml b/xplan-webapps/pom.xml deleted file mode 100644 index 62bdc9b101f84709f37b4b7da0d25b16c9cfef8c..0000000000000000000000000000000000000000 --- a/xplan-webapps/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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-webapps</artifactId> - <packaging>pom</packaging> - <description>Modul zur Gruppierung aller Webapps</description> - - <parent> - <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplanbox</artifactId> - <version>7.2-SNAPSHOT</version> - </parent> - - <modules> - <module>xplan-commons-web</module> - <module>xplan-validator-web-commons</module> - <module>xplan-validator-web</module> - <module>xplan-manager-web</module> - <module>xplan-root</module> - </modules> - -</project> \ No newline at end of file diff --git a/xplan-webapps/xplan-commons-web/pom.xml b/xplan-webapps/xplan-commons-web/pom.xml deleted file mode 100644 index 85cb987aaa7a8a1cd33b4b6e1f6036b29bae8cb4..0000000000000000000000000000000000000000 --- a/xplan-webapps/xplan-commons-web/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0"?> -<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-commons-web</artifactId> - <name>xplan-commons-web</name> - <packaging>jar</packaging> - - <parent> - <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-webapps</artifactId> - <version>7.2-SNAPSHOT</version> - </parent> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.java</include> - <include>**/*.gwt.xml</include> - </includes> - </resource> - </resources> - </build> - - <dependencies> - <dependency> - <groupId>org.gwtproject</groupId> - <artifactId>gwt-user</artifactId> - </dependency> - <dependency> - <groupId>org.gwtproject</groupId> - <artifactId>gwt-servlet</artifactId> - </dependency> - </dependencies> - -</project> \ No newline at end of file diff --git a/xplan-webservices/pom.xml b/xplan-webservices/pom.xml index 293a686ab7c09559dad1ba91c02623f64d8b02b2..c34c1cd26211cdcb0617dccda2772f2ac7f91939 100644 --- a/xplan-webservices/pom.xml +++ b/xplan-webservices/pom.xml @@ -12,22 +12,15 @@ </parent> <modules> - <module>xplan-commons-webservices</module> - <module>xplan-inspireplu</module> - <module>xplansyn-wfs</module> - <module>xplan-wfs</module> - <module>xplan-wms</module> - <module>xplan-validator-wms</module> + <module>xplan-webservices-core</module> + <module>xplan-webservices-inspireplu</module> + <module>xplan-webservices-mapproxy</module> + <module>xplan-webservices-mapserver</module> + <module>xplan-webservices-services</module> + <module>xplan-webservices-validator-wms</module> + <module>xplan-webservices-workspaces</module> </modules> - <profiles> - <profile> - <id>docker</id> - <modules> - <module>xplan-services-docker</module> - </modules> - </profile> - </profiles> <build> <plugins> <plugin> diff --git a/xplan-webservices/xplan-commons-webservices/pom.xml b/xplan-webservices/xplan-webservices-core/pom.xml similarity index 96% rename from xplan-webservices/xplan-commons-webservices/pom.xml rename to xplan-webservices/xplan-webservices-core/pom.xml index fecaa9e8759f1e308e186e410ce924354e9f341c..d126e7561354f0a081150928601a7734e9e1fcbe 100644 --- a/xplan-webservices/xplan-commons-webservices/pom.xml +++ b/xplan-webservices/xplan-webservices-core/pom.xml @@ -1,7 +1,7 @@ <?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-commons-webservices</artifactId> + <artifactId>xplan-webservices-core</artifactId> <packaging>jar</packaging> <description>Commons Paket fuer XPlan Manager und XPlan Validator</description> diff --git a/xplan-webservices/xplan-commons-webservices/src/main/java/de/latlon/xplan/Now.java b/xplan-webservices/xplan-webservices-core/src/main/java/de/latlon/xplan/Now.java similarity index 100% rename from xplan-webservices/xplan-commons-webservices/src/main/java/de/latlon/xplan/Now.java rename to xplan-webservices/xplan-webservices-core/src/main/java/de/latlon/xplan/Now.java diff --git a/xplan-webservices/xplan-commons-webservices/src/main/resources/META-INF/services/org.deegree.filter.function.FunctionProvider b/xplan-webservices/xplan-webservices-core/src/main/resources/META-INF/services/org.deegree.filter.function.FunctionProvider similarity index 100% rename from xplan-webservices/xplan-commons-webservices/src/main/resources/META-INF/services/org.deegree.filter.function.FunctionProvider rename to xplan-webservices/xplan-webservices-core/src/main/resources/META-INF/services/org.deegree.filter.function.FunctionProvider diff --git a/xplan-webservices/xplan-commons-webservices/src/main/resources/de/latlon/xplan/webservices/common/minimalist-format.json b/xplan-webservices/xplan-webservices-core/src/main/resources/de/latlon/xplan/webservices/common/minimalist-format.json similarity index 100% rename from xplan-webservices/xplan-commons-webservices/src/main/resources/de/latlon/xplan/webservices/common/minimalist-format.json rename to xplan-webservices/xplan-webservices-core/src/main/resources/de/latlon/xplan/webservices/common/minimalist-format.json diff --git a/xplan-webservices/xplan-commons-webservices/src/test/java/de/latlon/xplan/NowTest.java b/xplan-webservices/xplan-webservices-core/src/test/java/de/latlon/xplan/NowTest.java similarity index 100% rename from xplan-webservices/xplan-commons-webservices/src/test/java/de/latlon/xplan/NowTest.java rename to xplan-webservices/xplan-webservices-core/src/test/java/de/latlon/xplan/NowTest.java diff --git a/xplan-webservices/xplan-inspireplu/.maven-dockerignore b/xplan-webservices/xplan-webservices-inspireplu/.maven-dockerignore similarity index 100% rename from xplan-webservices/xplan-inspireplu/.maven-dockerignore rename to xplan-webservices/xplan-webservices-inspireplu/.maven-dockerignore diff --git a/xplan-webservices/xplan-inspireplu/Dockerfile b/xplan-webservices/xplan-webservices-inspireplu/Dockerfile similarity index 100% rename from xplan-webservices/xplan-inspireplu/Dockerfile rename to xplan-webservices/xplan-webservices-inspireplu/Dockerfile diff --git a/xplan-webservices/xplan-inspireplu/pom.xml b/xplan-webservices/xplan-webservices-inspireplu/pom.xml similarity index 56% rename from xplan-webservices/xplan-inspireplu/pom.xml rename to xplan-webservices/xplan-webservices-inspireplu/pom.xml index 27595074dfaa4102e593b1c30281e0af12160b42..4af0a7d668b596b5e08a93ad11d8a0f1f8b84648 100644 --- a/xplan-webservices/xplan-inspireplu/pom.xml +++ b/xplan-webservices/xplan-webservices-inspireplu/pom.xml @@ -1,7 +1,8 @@ <?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/maven-v4_0_0.xsd"> +<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-inspireplu</artifactId> + <artifactId>xplan-webservices-inspireplu</artifactId> <packaging>war</packaging> <description>deegree INSPIRE PLU webservices</description> @@ -14,7 +15,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons-webservices</artifactId> + <artifactId>xplan-webservices-core</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -38,6 +39,21 @@ </properties> <build> <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <configuration> + <images> + <image> + <build> + <args> + <WEB_CONTEXT>xplan-inspireplu</WEB_CONTEXT> + </args> + </build> + </image> + </images> + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> @@ -56,18 +72,18 @@ </plugins> </build> <dependencies> - <dependency> <!-- faked maven dependency to be after volume initializer in the reactor build --> - <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-docker-volume-init</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - <dependency> <!-- faked maven dependency to be after xplan-sql-scripts image in the reactor build --> - <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-sql-scripts</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> + <dependency> <!-- faked maven dependency to be after volume initializer in the reactor build --> + <groupId>de.latlon.product.xplanbox</groupId> + <artifactId>xplan-docker-volume-init</artifactId> + <version>${project.version}</version> + <type>pom</type> + </dependency> + <dependency> <!-- faked maven dependency to be after xplan-database-docker image in the reactor build --> + <groupId>de.latlon.product.xplanbox</groupId> + <artifactId>xplan-database-docker</artifactId> + <version>${project.version}</version> + <type>pom</type> + </dependency> </dependencies> </profile> </profiles> diff --git a/xplan-webservices/xplan-inspireplu/src/main/resources/log4j2.yaml b/xplan-webservices/xplan-webservices-inspireplu/src/main/resources/log4j2.yaml similarity index 100% rename from xplan-webservices/xplan-inspireplu/src/main/resources/log4j2.yaml rename to xplan-webservices/xplan-webservices-inspireplu/src/main/resources/log4j2.yaml diff --git a/xplan-webservices/xplan-inspireplu/src/main/webapp/version.txt b/xplan-webservices/xplan-webservices-inspireplu/src/main/webapp/version.txt similarity index 100% rename from xplan-webservices/xplan-inspireplu/src/main/webapp/version.txt rename to xplan-webservices/xplan-webservices-inspireplu/src/main/webapp/version.txt diff --git a/xplan-webservices/xplan-inspireplu/web.xml b/xplan-webservices/xplan-webservices-inspireplu/web.xml similarity index 100% rename from xplan-webservices/xplan-inspireplu/web.xml rename to xplan-webservices/xplan-webservices-inspireplu/web.xml diff --git a/xplan-webservices/xplan-webservices-mapproxy/pom.xml b/xplan-webservices/xplan-webservices-mapproxy/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..f154e2a58c1a1ff4fd61eea57db578a88c6577cf --- /dev/null +++ b/xplan-webservices/xplan-webservices-mapproxy/pom.xml @@ -0,0 +1,19 @@ +<?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-webservices-mapproxy</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>de.latlon.product.xplanbox</groupId> + <artifactId>xplan-webservices</artifactId> + <version>7.2-SNAPSHOT</version> + </parent> + + <modules> + <module>xplan-mapproxy-docker</module> + <module>xplan-mapproxy-config</module> + </modules> + +</project> \ No newline at end of file diff --git a/xplan-configuration/xplan-mapproxy-config/pom.xml b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-config/pom.xml similarity index 52% rename from xplan-configuration/xplan-mapproxy-config/pom.xml rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-config/pom.xml index a60f538c9be854a00610bfadcade4ff9ba9e1f08..40d9ceacf2d43ce0e24c208ba49ad8522823a090 100644 --- a/xplan-configuration/xplan-mapproxy-config/pom.xml +++ b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-config/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-configuration</artifactId> + <artifactId>xplan-webservices-mapproxy</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -15,6 +15,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>zip</id> + <goals> + <goal>single</goal> + </goals> + <configuration> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <descriptors> + <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + <phase>package</phase> + </execution> + </executions> </plugin> </plugins> </build> diff --git a/xplan-configuration/xplan-mapproxy-config/src/main/assembly/assembly.xml b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-config/src/main/assembly/assembly.xml similarity index 100% rename from xplan-configuration/xplan-mapproxy-config/src/main/assembly/assembly.xml rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-config/src/main/assembly/assembly.xml diff --git a/xplan-configuration/xplan-mapproxy-config/src/main/resources/mapproxy.yaml b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-config/src/main/resources/mapproxy.yaml similarity index 100% rename from xplan-configuration/xplan-mapproxy-config/src/main/resources/mapproxy.yaml rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-config/src/main/resources/mapproxy.yaml diff --git a/xplan-configuration/xplan-mapproxy-config/src/main/resources/seed.yaml b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-config/src/main/resources/seed.yaml similarity index 100% rename from xplan-configuration/xplan-mapproxy-config/src/main/resources/seed.yaml rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-config/src/main/resources/seed.yaml diff --git a/xplan-docker/xplan-docker-mapproxy/Dockerfile b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/Dockerfile similarity index 98% rename from xplan-docker/xplan-docker-mapproxy/Dockerfile rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/Dockerfile index bfb2af988723df3fdea3eab4e5b6c8c02b9f3789..a95676cd553ff497c131d3fe88d28cf02a22b5d1 100644 --- a/xplan-docker/xplan-docker-mapproxy/Dockerfile +++ b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/Dockerfile @@ -47,7 +47,7 @@ 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 target/xplan-mapproxy-docker-*.tgz / ADD docker-entrypoint.sh /docker-entrypoint.sh WORKDIR /srv/mapproxy diff --git a/xplan-docker/xplan-docker-mapproxy/app.py b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/app.py similarity index 100% rename from xplan-docker/xplan-docker-mapproxy/app.py rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/app.py diff --git a/xplan-docker/xplan-docker-mapproxy/docker-entrypoint.sh b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/docker-entrypoint.sh similarity index 84% rename from xplan-docker/xplan-docker-mapproxy/docker-entrypoint.sh rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/docker-entrypoint.sh index c7cebd8e8cf6ca2a3d9176063ecae980212baf68..64dd4d9c63d1e32d3bb6a153962a3007641e8fec 100755 --- a/xplan-docker/xplan-docker-mapproxy/docker-entrypoint.sh +++ b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/docker-entrypoint.sh @@ -6,8 +6,8 @@ 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 +envsubst "$defined_envs" < /xplan-mapproxy-docker/xplan-mapproxy-config/mapproxy.yaml > /srv/mapproxy/mapproxy.yaml +envsubst "$defined_envs" < /xplan-mapproxy-docker/xplan-mapproxy-config/seed.yaml > /srv/mapproxy/seed.yaml if [ "$executionMode" == "seed" ] then diff --git a/xplan-docker/xplan-docker-mapproxy/log.ini b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/log.ini similarity index 100% rename from xplan-docker/xplan-docker-mapproxy/log.ini rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/log.ini diff --git a/xplan-docker/xplan-docker-mapproxy/pom.xml b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/pom.xml similarity index 89% rename from xplan-docker/xplan-docker-mapproxy/pom.xml rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/pom.xml index b9bf77e78cf9e31e005be57d255faf6eaf8d7cbc..276079d023bc38719bb1ea88ac76db5365dff419 100644 --- a/xplan-docker/xplan-docker-mapproxy/pom.xml +++ b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/pom.xml @@ -1,13 +1,13 @@ <?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> + <artifactId>xplan-mapproxy-docker</artifactId> <packaging>pom</packaging> <description>XPlan Docker for MapProxy</description> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-docker</artifactId> + <artifactId>xplan-webservices-mapproxy</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -23,7 +23,7 @@ <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> - <descriptor>src/assembly/xplan-docker-mapproxy.xml</descriptor> + <descriptor>src/assembly/xplan-mapproxy-docker.xml</descriptor> </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> diff --git a/xplan-docker/xplan-docker-mapproxy/src/assembly/xplan-docker-mapproxy.xml b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-mapproxy-docker.xml similarity index 83% rename from xplan-docker/xplan-docker-mapproxy/src/assembly/xplan-docker-mapproxy.xml rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-mapproxy-docker.xml index f8a104cb6ab862f68719359344e90ceb92488d5d..2f486f4bbc79d12f87d5c5a8419decc3a2d13fc6 100644 --- a/xplan-docker/xplan-docker-mapproxy/src/assembly/xplan-docker-mapproxy.xml +++ b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-mapproxy-docker.xml @@ -1,13 +1,13 @@ <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> + <id>xplan-mapproxy-docker</id> <formats> <format>tgz</format> </formats> - <baseDirectory>xplan-docker-mapproxy</baseDirectory> + <baseDirectory>xplan-mapproxy-docker</baseDirectory> <dependencySets> - <!--xplan-manager-config--> + <!--xplan-mapproxy-config--> <dependencySet> <outputDirectory>/xplan-mapproxy-config</outputDirectory> <includes> diff --git a/xplan-docker/xplan-docker-mapproxy/uwsgi.ini b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/uwsgi.ini similarity index 100% rename from xplan-docker/xplan-docker-mapproxy/uwsgi.ini rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/uwsgi.ini diff --git a/xplan-webservices/xplan-webservices-mapserver/pom.xml b/xplan-webservices/xplan-webservices-mapserver/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..8e626481068fa4c8626628ba76e6cb922ea8423f --- /dev/null +++ b/xplan-webservices/xplan-webservices-mapserver/pom.xml @@ -0,0 +1,19 @@ +<?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-webservices-mapserver</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>de.latlon.product.xplanbox</groupId> + <artifactId>xplan-webservices</artifactId> + <version>7.2-SNAPSHOT</version> + </parent> + + <modules> + <module>xplan-mapserver-docker</module> + <module>xplan-mapserver-config</module> + </modules> + +</project> \ No newline at end of file diff --git a/xplan-configuration/xplan-mapserver-config/pom.xml b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-config/pom.xml similarity index 52% rename from xplan-configuration/xplan-mapserver-config/pom.xml rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-config/pom.xml index af35d1f386f9349a02254eb8eaeee61b1e6b705b..cc4883209f45f273875d3747559cd4a78b290687 100644 --- a/xplan-configuration/xplan-mapserver-config/pom.xml +++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-config/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-configuration</artifactId> + <artifactId>xplan-webservices-mapserver</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -15,6 +15,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>zip</id> + <goals> + <goal>single</goal> + </goals> + <configuration> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <descriptors> + <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + <phase>package</phase> + </execution> + </executions> </plugin> </plugins> </build> diff --git a/xplan-configuration/xplan-mapserver-config/src/main/assembly/assembly.xml b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-config/src/main/assembly/assembly.xml similarity index 100% rename from xplan-configuration/xplan-mapserver-config/src/main/assembly/assembly.xml rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-config/src/main/assembly/assembly.xml diff --git a/xplan-configuration/xplan-mapserver-config/src/main/resources/mapserver.map b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-config/src/main/resources/mapserver.map similarity index 100% rename from xplan-configuration/xplan-mapserver-config/src/main/resources/mapserver.map rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-config/src/main/resources/mapserver.map diff --git a/xplan-docker/xplan-docker-mapserver/Dockerfile b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile similarity index 83% rename from xplan-docker/xplan-docker-mapserver/Dockerfile rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile index 96933c7a12c76b43f39df8310519784e68ce742e..777f17d6bdfa04e00a5e67a3ee4c3fcd8a6f4784 100644 --- a/xplan-docker/xplan-docker-mapserver/Dockerfile +++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile @@ -20,12 +20,12 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \ ENV TZ=Europe/Berlin RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata -RUN mkdir -p /xplan-docker-mapserver \ +RUN mkdir -p /xplan-mapserver-docker \ && chown 1001 /etc/mapserver -ADD target/xplan-docker-mapserver-*.tgz / -ADD startupWithConfiguredMapserver.sh /xplan-docker-mapserver/ +ADD target/xplan-mapserver-docker-*.tgz / +ADD startupWithConfiguredMapserver.sh /xplan-mapserver-docker/ USER 1001 -CMD ["/xplan-docker-mapserver/startupWithConfiguredMapserver.sh"] \ No newline at end of file +CMD ["/xplan-mapserver-docker/startupWithConfiguredMapserver.sh"] \ No newline at end of file diff --git a/xplan-docker/xplan-docker-mapserver/pom.xml b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml similarity index 89% rename from xplan-docker/xplan-docker-mapserver/pom.xml rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml index d8a9a125266151ac2580f645f52e9816830281a9..b56d65b65ac6f6e8cfe20adab56211671f692a34 100644 --- a/xplan-docker/xplan-docker-mapserver/pom.xml +++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml @@ -1,13 +1,13 @@ <?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-mapserver</artifactId> + <artifactId>xplan-mapserver-docker</artifactId> <packaging>pom</packaging> <description>XPlan Docker for MapServer</description> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-docker</artifactId> + <artifactId>xplan-webservices-mapserver</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -23,7 +23,7 @@ <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> - <descriptor>src/assembly/xplan-docker-mapserver.xml</descriptor> + <descriptor>src/assembly/xplan-mapserver-docker.xml</descriptor> </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> diff --git a/xplan-docker/xplan-docker-mapserver/src/assembly/xplan-docker-mapserver.xml b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-mapserver-docker.xml similarity index 83% rename from xplan-docker/xplan-docker-mapserver/src/assembly/xplan-docker-mapserver.xml rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-mapserver-docker.xml index 58cfffe52510704c3d688cc4b8e105c13302f4ac..96689483a7b8a9ce09dd8e68afa4dbb5068dccfc 100644 --- a/xplan-docker/xplan-docker-mapserver/src/assembly/xplan-docker-mapserver.xml +++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-mapserver-docker.xml @@ -1,13 +1,13 @@ <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-mapserver</id> + <id>xplan-mapserver-docker</id> <formats> <format>tgz</format> </formats> - <baseDirectory>xplan-docker-mapserver</baseDirectory> + <baseDirectory>xplan-mapserver-docker</baseDirectory> <dependencySets> - <!--xplan-manager-config--> + <!--xplan-mapserver-config--> <dependencySet> <outputDirectory>/xplan-mapserver-config</outputDirectory> <includes> diff --git a/xplan-docker/xplan-docker-mapserver/startupWithConfiguredMapserver.sh b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh similarity index 91% rename from xplan-docker/xplan-docker-mapserver/startupWithConfiguredMapserver.sh rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh index 6bf72c3640f5791a5c820d744d6cc930335a3b84..93697c34e9faf1a1eb28bb415df679d79b01c4f8 100755 --- a/xplan-docker/xplan-docker-mapserver/startupWithConfiguredMapserver.sh +++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh @@ -3,7 +3,7 @@ echo "MapServer config initialization..." if [ -z ${MS_MAPFILE+x} ]; then - echo "ERROR: environment variable MS_MAPFILE not set!" + echo "[$(date -Iseconds)] ERROR: environment variable MS_MAPFILE not set!" exit 1 fi @@ -15,7 +15,7 @@ fi echo "[$(date -Iseconds)] Initializing mapserver config ..." -cp /xplan-docker-mapserver/xplan-mapserver-config/mapserver.map $MS_MAPFILE +cp /xplan-mapserver-docker/xplan-mapserver-config/mapserver.map $MS_MAPFILE XPLAN_S3_BUCKET_NAME="${XPLAN_S3_BUCKET_NAME:-tobedefined}" AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID:-tobedefined}" diff --git a/xplan-webservices/xplan-webservices-services/pom.xml b/xplan-webservices/xplan-webservices-services/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..7bad190a074b07b69c247a607d2a18da5f3ca40a --- /dev/null +++ b/xplan-webservices/xplan-webservices-services/pom.xml @@ -0,0 +1,29 @@ +<?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-webservices-services</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>de.latlon.product.xplanbox</groupId> + <artifactId>xplan-webservices</artifactId> + <version>7.2-SNAPSHOT</version> + </parent> + + <modules> + <module>xplan-services-wfs</module> + <module>xplan-services-wfs-syn</module> + <module>xplan-services-wms</module> + </modules> + + <profiles> + <profile> + <id>docker</id> + <modules> + <module>xplan-services-docker</module> + </modules> + </profile> + </profiles> + +</project> \ No newline at end of file diff --git a/xplan-webservices/xplan-services-docker/Dockerfile b/xplan-webservices/xplan-webservices-services/xplan-services-docker/Dockerfile similarity index 100% rename from xplan-webservices/xplan-services-docker/Dockerfile rename to xplan-webservices/xplan-webservices-services/xplan-services-docker/Dockerfile diff --git a/xplan-webservices/xplan-services-docker/pom.xml b/xplan-webservices/xplan-webservices-services/xplan-services-docker/pom.xml similarity index 78% rename from xplan-webservices/xplan-services-docker/pom.xml rename to xplan-webservices/xplan-webservices-services/xplan-services-docker/pom.xml index 262e01ee3a67ee15fc02fb9e0c2a051cfb414f16..c7ab010ef33e7b4c804912c8694bb122ae739847 100644 --- a/xplan-webservices/xplan-services-docker/pom.xml +++ b/xplan-webservices/xplan-webservices-services/xplan-services-docker/pom.xml @@ -1,13 +1,12 @@ <?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-services-docker</artifactId> <packaging>pom</packaging> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-webservices</artifactId> + <artifactId>xplan-webservices-services</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -29,23 +28,26 @@ <inline> <dependencySets> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputDirectory>xplan-wms</outputDirectory> <includes> - <include>${project.groupId}:xplan-wms:war</include> + <include>${project.groupId}:xplan-services-wms:war</include> </includes> <unpack>true</unpack> </dependencySet> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputDirectory>xplan-wfs</outputDirectory> <includes> - <include>${project.groupId}:xplan-wfs:war</include> + <include>${project.groupId}:xplan-services-wfs:war</include> </includes> <unpack>true</unpack> </dependencySet> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputDirectory>xplansyn-wfs</outputDirectory> <includes> - <include>${project.groupId}:xplansyn-wfs:war</include> + <include>${project.groupId}:xplan-services-wfs-syn:war</include> </includes> <unpack>true</unpack> </dependencySet> @@ -63,19 +65,19 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-wms</artifactId> + <artifactId>xplan-services-wms</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-wfs</artifactId> + <artifactId>xplan-services-wfs</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplansyn-wfs</artifactId> + <artifactId>xplan-services-wfs-syn</artifactId> <version>${project.version}</version> <type>war</type> </dependency> @@ -91,9 +93,9 @@ <version>${project.version}</version> <type>pom</type> </dependency> - <dependency> <!-- faked maven dependency to be after xplan-sql-scripts image in the reactor build --> + <dependency> <!-- faked maven dependency to be after xplan-database-docker image in the reactor build --> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-sql-scripts</artifactId> + <artifactId>xplan-database-docker</artifactId> <version>${project.version}</version> <type>pom</type> </dependency> diff --git a/xplan-webservices/xplan-services-docker/web.xml b/xplan-webservices/xplan-webservices-services/xplan-services-docker/web.xml similarity index 100% rename from xplan-webservices/xplan-services-docker/web.xml rename to xplan-webservices/xplan-webservices-services/xplan-services-docker/web.xml diff --git a/xplan-webservices/xplansyn-wfs/pom.xml b/xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/pom.xml similarity index 87% rename from xplan-webservices/xplansyn-wfs/pom.xml rename to xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/pom.xml index 70b006bc83e403b59461b152c1566c073c768a94..4a14017b021effa96456786f2333d3dd76d1014c 100644 --- a/xplan-webservices/xplansyn-wfs/pom.xml +++ b/xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/pom.xml @@ -1,19 +1,19 @@ <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>xplansyn-wfs</artifactId> + <artifactId>xplan-services-wfs-syn</artifactId> <packaging>war</packaging> <description>deegree XPlanSyn WebFeatureService</description> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-webservices</artifactId> + <artifactId>xplan-webservices-services</artifactId> <version>7.2-SNAPSHOT</version> </parent> <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons-webservices</artifactId> + <artifactId>xplan-webservices-core</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/xplan-webservices/xplansyn-wfs/src/main/resources/log4j2.component.properties b/xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/src/main/resources/log4j2.component.properties similarity index 100% rename from xplan-webservices/xplansyn-wfs/src/main/resources/log4j2.component.properties rename to xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/src/main/resources/log4j2.component.properties diff --git a/xplan-webservices/xplansyn-wfs/src/main/resources/log4j2.yaml b/xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/src/main/resources/log4j2.yaml similarity index 100% rename from xplan-webservices/xplansyn-wfs/src/main/resources/log4j2.yaml rename to xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/src/main/resources/log4j2.yaml diff --git a/xplan-webservices/xplansyn-wfs/src/main/webapp/WEB-INF/web.xml b/xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from xplan-webservices/xplansyn-wfs/src/main/webapp/WEB-INF/web.xml rename to xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/src/main/webapp/WEB-INF/web.xml diff --git a/xplan-webservices/xplan-validator-wms/src/main/webapp/version.txt b/xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/src/main/webapp/version.txt similarity index 100% rename from xplan-webservices/xplan-validator-wms/src/main/webapp/version.txt rename to xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/src/main/webapp/version.txt diff --git a/xplan-webservices/xplan-wfs/pom.xml b/xplan-webservices/xplan-webservices-services/xplan-services-wfs/pom.xml similarity index 87% rename from xplan-webservices/xplan-wfs/pom.xml rename to xplan-webservices/xplan-webservices-services/xplan-services-wfs/pom.xml index db6ae1225e973d45506fe4dd48f3939b18c1c604..8cd9f26f6b3c6ab822eeb7377f77f0d149060b5d 100644 --- a/xplan-webservices/xplan-wfs/pom.xml +++ b/xplan-webservices/xplan-webservices-services/xplan-services-wfs/pom.xml @@ -1,19 +1,19 @@ <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-wfs</artifactId> + <artifactId>xplan-services-wfs</artifactId> <packaging>war</packaging> <description>deegree XPlan WebFeatureService</description> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-webservices</artifactId> + <artifactId>xplan-webservices-services</artifactId> <version>7.2-SNAPSHOT</version> </parent> <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons-webservices</artifactId> + <artifactId>xplan-webservices-core</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/xplan-webservices/xplan-wfs/src/main/resources/log4j2.component.properties b/xplan-webservices/xplan-webservices-services/xplan-services-wfs/src/main/resources/log4j2.component.properties similarity index 100% rename from xplan-webservices/xplan-wfs/src/main/resources/log4j2.component.properties rename to xplan-webservices/xplan-webservices-services/xplan-services-wfs/src/main/resources/log4j2.component.properties diff --git a/xplan-webservices/xplan-wfs/src/main/resources/log4j2.yaml b/xplan-webservices/xplan-webservices-services/xplan-services-wfs/src/main/resources/log4j2.yaml similarity index 100% rename from xplan-webservices/xplan-wfs/src/main/resources/log4j2.yaml rename to xplan-webservices/xplan-webservices-services/xplan-services-wfs/src/main/resources/log4j2.yaml diff --git a/xplan-webservices/xplan-wfs/src/main/webapp/WEB-INF/web.xml b/xplan-webservices/xplan-webservices-services/xplan-services-wfs/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from xplan-webservices/xplan-wfs/src/main/webapp/WEB-INF/web.xml rename to xplan-webservices/xplan-webservices-services/xplan-services-wfs/src/main/webapp/WEB-INF/web.xml diff --git a/xplan-webservices/xplan-wfs/src/main/webapp/version.txt b/xplan-webservices/xplan-webservices-services/xplan-services-wfs/src/main/webapp/version.txt similarity index 100% rename from xplan-webservices/xplan-wfs/src/main/webapp/version.txt rename to xplan-webservices/xplan-webservices-services/xplan-services-wfs/src/main/webapp/version.txt diff --git a/xplan-webservices/xplan-wms/pom.xml b/xplan-webservices/xplan-webservices-services/xplan-services-wms/pom.xml similarity index 95% rename from xplan-webservices/xplan-wms/pom.xml rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/pom.xml index b4952278d68c1dbed31514d30f99d03a87b42d7b..f9e81a8bf7ded21aeacbc2999146a1159b10c8be 100644 --- a/xplan-webservices/xplan-wms/pom.xml +++ b/xplan-webservices/xplan-webservices-services/xplan-services-wms/pom.xml @@ -1,13 +1,13 @@ <?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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <artifactId>xplan-wms</artifactId> + <artifactId>xplan-services-wms</artifactId> <packaging>war</packaging> <description>deegree XPlan WebMapService</description> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplan-webservices</artifactId> + <artifactId>xplan-webservices-services</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -46,7 +46,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons-webservices</artifactId> + <artifactId>xplan-webservices-core</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/DeletePlanwerkServlet.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/DeletePlanwerkServlet.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/DeletePlanwerkServlet.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/DeletePlanwerkServlet.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/MetadataProviderWrapper.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/MetadataProviderWrapper.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/MetadataProviderWrapper.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/MetadataProviderWrapper.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/Plan.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/Plan.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/Plan.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/Plan.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkBuilder.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkBuilder.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkBuilder.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkBuilder.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkController.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkController.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkController.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkController.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkFilter.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkFilter.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkFilter.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkFilter.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkMetadata.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkMetadata.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkMetadata.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkMetadata.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkProvider.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkProvider.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkProvider.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkProvider.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkReader.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkReader.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkReader.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkReader.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkResourceLocation.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkResourceLocation.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkResourceLocation.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/planwerkwms/PlanwerkResourceLocation.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/GetAttachmentHandler.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/wms/GetAttachmentHandler.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/GetAttachmentHandler.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/wms/GetAttachmentHandler.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/ArchiveValidityPeriodInspector.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/wms/visibility/ArchiveValidityPeriodInspector.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/ArchiveValidityPeriodInspector.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/wms/visibility/ArchiveValidityPeriodInspector.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/DefaultValidityPeriodInspector.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/wms/visibility/DefaultValidityPeriodInspector.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/DefaultValidityPeriodInspector.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/wms/visibility/DefaultValidityPeriodInspector.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/PreValidityPeriodInspector.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/wms/visibility/PreValidityPeriodInspector.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/PreValidityPeriodInspector.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/wms/visibility/PreValidityPeriodInspector.java diff --git a/xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/ValidityPeriodInspector.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/wms/visibility/ValidityPeriodInspector.java similarity index 100% rename from xplan-webservices/xplan-wms/src/main/java/de/latlon/xplan/wms/visibility/ValidityPeriodInspector.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/java/de/latlon/xplan/wms/visibility/ValidityPeriodInspector.java diff --git a/xplan-webservices/xplan-wms/src/main/resources/META-INF/schemas/services/planwerkwms/1.0/planwerk_configuration.xsd b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/resources/META-INF/schemas/services/planwerkwms/1.0/planwerk_configuration.xsd similarity index 100% rename from xplan-webservices/xplan-wms/src/main/resources/META-INF/schemas/services/planwerkwms/1.0/planwerk_configuration.xsd rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/resources/META-INF/schemas/services/planwerkwms/1.0/planwerk_configuration.xsd diff --git a/xplan-webservices/xplan-wms/src/main/resources/META-INF/services/org.deegree.services.OWSProvider b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/resources/META-INF/services/org.deegree.services.OWSProvider similarity index 100% rename from xplan-webservices/xplan-wms/src/main/resources/META-INF/services/org.deegree.services.OWSProvider rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/resources/META-INF/services/org.deegree.services.OWSProvider diff --git a/xplan-webservices/xplan-wms/src/main/resources/log4j2.component.properties b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/resources/log4j2.component.properties similarity index 100% rename from xplan-webservices/xplan-wms/src/main/resources/log4j2.component.properties rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/resources/log4j2.component.properties diff --git a/xplan-webservices/xplan-wms/src/main/resources/log4j2.yaml b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/resources/log4j2.yaml similarity index 100% rename from xplan-webservices/xplan-wms/src/main/resources/log4j2.yaml rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/resources/log4j2.yaml diff --git a/xplan-webservices/xplan-wms/src/main/webapp/WEB-INF/web.xml b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/webapp/WEB-INF/web.xml similarity index 99% rename from xplan-webservices/xplan-wms/src/main/webapp/WEB-INF/web.xml rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/webapp/WEB-INF/web.xml index 7ae3b9655b41f64b432e6cc8eb812ad0c7918dfe..f99a9a9084e9e5f34024e96799e7d490b5c7411f 100644 --- a/xplan-webservices/xplan-wms/src/main/webapp/WEB-INF/web.xml +++ b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/webapp/WEB-INF/web.xml @@ -143,7 +143,7 @@ <servlet-class>de.latlon.xplan.wms.GetAttachmentHandler</servlet-class> <init-param> <param-name>workspaceName</param-name> - <param-value>xplansyn-wms-workspace</param-value> + <param-value>xplan-services-wms-workspace</param-value> </init-param> <init-param> <param-name>jdbcConnectionId</param-name> diff --git a/xplan-webservices/xplan-wms/src/main/webapp/version.txt b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/webapp/version.txt similarity index 100% rename from xplan-webservices/xplan-wms/src/main/webapp/version.txt rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/main/webapp/version.txt diff --git a/xplan-webservices/xplan-wms/src/test/java/de/latlon/xplan/planwerkwms/PlanwerkMetadataTest.java b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/test/java/de/latlon/xplan/planwerkwms/PlanwerkMetadataTest.java similarity index 100% rename from xplan-webservices/xplan-wms/src/test/java/de/latlon/xplan/planwerkwms/PlanwerkMetadataTest.java rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/test/java/de/latlon/xplan/planwerkwms/PlanwerkMetadataTest.java diff --git a/xplan-webservices/xplan-wms/src/test/resources/log4j2-test.yaml b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/test/resources/log4j2-test.yaml similarity index 100% rename from xplan-webservices/xplan-wms/src/test/resources/log4j2-test.yaml rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/test/resources/log4j2-test.yaml diff --git a/xplan-webservices/xplan-wms/src/test/resources/planwerkwms.xml b/xplan-webservices/xplan-webservices-services/xplan-services-wms/src/test/resources/planwerkwms.xml similarity index 100% rename from xplan-webservices/xplan-wms/src/test/resources/planwerkwms.xml rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/src/test/resources/planwerkwms.xml diff --git a/xplan-webservices/xplan-validator-wms/Dockerfile b/xplan-webservices/xplan-webservices-validator-wms/Dockerfile similarity index 90% rename from xplan-webservices/xplan-validator-wms/Dockerfile rename to xplan-webservices/xplan-webservices-validator-wms/Dockerfile index d9e5b9efd95ae593674bcef8c093959951a66cf0..e8a0abb1d167dfd4083749805e313dbdff05f336 100644 --- a/xplan-webservices/xplan-validator-wms/Dockerfile +++ b/xplan-webservices/xplan-webservices-validator-wms/Dockerfile @@ -27,10 +27,10 @@ ENV DEEGREE_WORKSPACE_ROOT=/xplanbox/deegree USER root # add xplan-validator-wms directly unpacked -ADD target/xplan-validator-wms-*.war /tmp/ +ADD target/xplan-webservices-validator-wms-*.war /tmp/ RUN mkdir /opt/bitnami/tomcat/webapps/$WEB_CONTEXT \ && cd /opt/bitnami/tomcat/webapps/$WEB_CONTEXT \ - && jar xf /tmp/xplan-validator-wms-*.war \ - && rm /tmp/xplan-validator-wms-*.war + && jar xf /tmp/xplan-webservices-validator-wms-*.war \ + && rm /tmp/xplan-webservices-validator-wms-*.war USER 1001 \ No newline at end of file diff --git a/xplan-webservices/xplan-validator-wms/pom.xml b/xplan-webservices/xplan-webservices-validator-wms/pom.xml similarity index 74% rename from xplan-webservices/xplan-validator-wms/pom.xml rename to xplan-webservices/xplan-webservices-validator-wms/pom.xml index ffdd59791cabcf40b02ce1860cd5690d9642a69c..dc23877298943dbb6f39ded366ed8c65f0f755b2 100644 --- a/xplan-webservices/xplan-validator-wms/pom.xml +++ b/xplan-webservices/xplan-webservices-validator-wms/pom.xml @@ -1,7 +1,7 @@ <?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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <artifactId>xplan-validator-wms</artifactId> + <artifactId>xplan-webservices-validator-wms</artifactId> <packaging>war</packaging> <description>XPlanValidatorWMS</description> @@ -18,7 +18,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-commons-webservices</artifactId> + <artifactId>xplan-webservices-core</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -49,6 +49,25 @@ <properties> <docker-image.skip>false</docker-image.skip> </properties> + <build> + <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <configuration> + <images> + <image> + <build> + <args> + <WEB_CONTEXT>xplan-validator-wms</WEB_CONTEXT> + </args> + </build> + </image> + </images> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> <!-- faked maven dependency to be after base docker image in the reactor build --> <groupId>de.latlon.product.xplanbox</groupId> diff --git a/xplan-webservices/xplan-validator-wms/src/main/java/de/latlon/xplan/validator/wms/ApplicationContextInitializer.java b/xplan-webservices/xplan-webservices-validator-wms/src/main/java/de/latlon/xplan/validator/wms/ApplicationContextInitializer.java similarity index 100% rename from xplan-webservices/xplan-validator-wms/src/main/java/de/latlon/xplan/validator/wms/ApplicationContextInitializer.java rename to xplan-webservices/xplan-webservices-validator-wms/src/main/java/de/latlon/xplan/validator/wms/ApplicationContextInitializer.java diff --git a/xplan-webservices/xplan-validator-wms/src/main/java/de/latlon/xplan/validator/wms/config/JobWebContext.java b/xplan-webservices/xplan-webservices-validator-wms/src/main/java/de/latlon/xplan/validator/wms/config/JobWebContext.java similarity index 100% rename from xplan-webservices/xplan-validator-wms/src/main/java/de/latlon/xplan/validator/wms/config/JobWebContext.java rename to xplan-webservices/xplan-webservices-validator-wms/src/main/java/de/latlon/xplan/validator/wms/config/JobWebContext.java diff --git a/xplan-webservices/xplan-validator-wms/src/main/resources/log4j2.component.properties b/xplan-webservices/xplan-webservices-validator-wms/src/main/resources/log4j2.component.properties similarity index 100% rename from xplan-webservices/xplan-validator-wms/src/main/resources/log4j2.component.properties rename to xplan-webservices/xplan-webservices-validator-wms/src/main/resources/log4j2.component.properties diff --git a/xplan-webservices/xplan-validator-wms/src/main/resources/log4j2.yaml b/xplan-webservices/xplan-webservices-validator-wms/src/main/resources/log4j2.yaml similarity index 100% rename from xplan-webservices/xplan-validator-wms/src/main/resources/log4j2.yaml rename to xplan-webservices/xplan-webservices-validator-wms/src/main/resources/log4j2.yaml diff --git a/xplan-webservices/xplan-validator-wms/src/main/webapp/WEB-INF/web.xml b/xplan-webservices/xplan-webservices-validator-wms/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from xplan-webservices/xplan-validator-wms/src/main/webapp/WEB-INF/web.xml rename to xplan-webservices/xplan-webservices-validator-wms/src/main/webapp/WEB-INF/web.xml diff --git a/xplan-webservices/xplansyn-wfs/src/main/webapp/version.txt b/xplan-webservices/xplan-webservices-validator-wms/src/main/webapp/version.txt similarity index 100% rename from xplan-webservices/xplansyn-wfs/src/main/webapp/version.txt rename to xplan-webservices/xplan-webservices-validator-wms/src/main/webapp/version.txt diff --git a/xplan-workspaces/LICENSE_UNKNOWN.txt b/xplan-webservices/xplan-webservices-workspaces/LICENSE_UNKNOWN.txt similarity index 100% rename from xplan-workspaces/LICENSE_UNKNOWN.txt rename to xplan-webservices/xplan-webservices-workspaces/LICENSE_UNKNOWN.txt diff --git a/xplan-workspaces/pom.xml b/xplan-webservices/xplan-webservices-workspaces/pom.xml similarity index 84% rename from xplan-workspaces/pom.xml rename to xplan-webservices/xplan-webservices-workspaces/pom.xml index 370d36669ccad3aebc7f576eaa18f0e8347bba1b..a275e55bfa917b3ef58533c1dc5b8f6a974391f6 100644 --- a/xplan-workspaces/pom.xml +++ b/xplan-webservices/xplan-webservices-workspaces/pom.xml @@ -1,13 +1,13 @@ <?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-workspaces</artifactId> + <artifactId>xplan-webservices-workspaces</artifactId> <packaging>pom</packaging> <description>Modul zur Gruppierung aller Workspaces</description> <parent> <groupId>de.latlon.product.xplanbox</groupId> - <artifactId>xplanbox</artifactId> + <artifactId>xplan-webservices</artifactId> <version>7.2-SNAPSHOT</version> </parent> @@ -19,7 +19,7 @@ <executions> <!-- XPlanInspirePlu Workspace --> <execution> - <id>xplan-inspireplu-workspace</id> + <id>xplan-webservices-inspireplu-workspace</id> <goals> <goal>single</goal> </goals> @@ -27,7 +27,7 @@ <configuration> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <descriptors> - <descriptor>${project.basedir}/src/main/assembly/xplan-inspireplu-workspace.xml</descriptor> + <descriptor>${project.basedir}/src/main/assembly/xplan-webservices-inspireplu-workspace.xml</descriptor> </descriptors> <appendAssemblyId>true</appendAssemblyId> </configuration> @@ -64,7 +64,7 @@ </execution> <!-- XPlanValidatorWMS Workspace - InMemory --> <execution> - <id>xplan-validator-wms-memory-workspace</id> + <id>xplan-webservices-validator-wms-memory-workspace</id> <goals> <goal>single</goal> </goals> @@ -72,14 +72,14 @@ <configuration> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <descriptors> - <descriptor>${project.basedir}/src/main/assembly/xplan-validator-wms-memory-workspace.xml</descriptor> + <descriptor>${project.basedir}/src/main/assembly/xplan-webservices-validator-wms-memory-workspace.xml</descriptor> </descriptors> <appendAssemblyId>true</appendAssemblyId> </configuration> </execution> <!-- XPlanValidatorWMS Workspace SQLFeatureStore--> <execution> - <id>xplan-validator-wms-sql-workspace</id> + <id>xplan-webservices-validator-wms-sql-workspace</id> <goals> <goal>single</goal> </goals> @@ -87,14 +87,14 @@ <configuration> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <descriptors> - <descriptor>${project.basedir}/src/main/assembly/xplan-validator-wms-sql-workspace.xml</descriptor> + <descriptor>${project.basedir}/src/main/assembly/xplan-webservices-validator-wms-sql-workspace.xml</descriptor> </descriptors> <appendAssemblyId>true</appendAssemblyId> </configuration> </execution> <!-- XPlanWFS Workspace --> <execution> - <id>xplan-wfs-workspace</id> + <id>xplan-services-wfs-workspace</id> <goals> <goal>single</goal> </goals> @@ -102,14 +102,14 @@ <configuration> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <descriptors> - <descriptor>${project.basedir}/src/main/assembly/xplan-wfs-workspace.xml</descriptor> + <descriptor>${project.basedir}/src/main/assembly/xplan-services-wfs-workspace.xml</descriptor> </descriptors> <appendAssemblyId>true</appendAssemblyId> </configuration> </execution> <!-- XPlanSynWFS Workspace --> <execution> - <id>xplansyn-wfs-workspace</id> + <id>xplan-services-wfs-syn-workspace</id> <goals> <goal>single</goal> </goals> @@ -117,14 +117,14 @@ <configuration> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <descriptors> - <descriptor>${project.basedir}/src/main/assembly/xplansyn-wfs-workspace.xml</descriptor> + <descriptor>${project.basedir}/src/main/assembly/xplan-services-wfs-syn-workspace.xml</descriptor> </descriptors> <appendAssemblyId>true</appendAssemblyId> </configuration> </execution> - <!-- XPlanSynWMS Workspace --> + <!-- XPlanWMS Workspace --> <execution> - <id>xplansyn-wms-workspace</id> + <id>xplan-services-wms-workspace</id> <goals> <goal>single</goal> </goals> @@ -132,7 +132,7 @@ <configuration> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <descriptors> - <descriptor>${project.basedir}/src/main/assembly/xplansyn-wms-workspace.xml</descriptor> + <descriptor>${project.basedir}/src/main/assembly/xplan-services-wms-workspace.xml</descriptor> </descriptors> <appendAssemblyId>true</appendAssemblyId> </configuration> @@ -145,12 +145,12 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-schemas</artifactId> + <artifactId>xplan-core-schemas</artifactId> <type>zip</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>xplan-sql-scripts</artifactId> + <artifactId>xplan-database-docker</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> diff --git a/xplan-workspaces/src/main/assembly/xplan-manager-workspace.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-manager-workspace.xml similarity index 88% rename from xplan-workspaces/src/main/assembly/xplan-manager-workspace.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-manager-workspace.xml index 22b35451161e59014c37963a63582cdfff0a5cb2..04fc61ea76a32e07fb4d0c257531a83f0d5daf8e 100644 --- a/xplan-workspaces/src/main/assembly/xplan-manager-workspace.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-manager-workspace.xml @@ -52,19 +52,21 @@ <outputDirectory>/modules</outputDirectory> <useProjectArtifact>false</useProjectArtifact> <excludes> - <exclude>de.latlon.product.xplanbox:xplan-schemas</exclude> + <exclude>de.latlon.product.xplanbox:xplan-core-schemas</exclude> </excludes> </dependencySet> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <includes> - <include>de.latlon.product.xplanbox:xplan-schemas</include> + <include>de.latlon.product.xplanbox:xplan-core-schemas</include> </includes> <unpack>true</unpack> <outputDirectory>/</outputDirectory> </dependencySet> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <includes> - <include>de.latlon.product.xplanbox:xplan-sql-scripts</include> + <include>de.latlon.product.xplanbox:xplan-database-docker</include> </includes> <unpack>true</unpack> <outputDirectory>/sql</outputDirectory> diff --git a/xplan-workspaces/src/main/assembly/xplansyn-wfs-workspace.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-services-wfs-syn-workspace.xml similarity index 94% rename from xplan-workspaces/src/main/assembly/xplansyn-wfs-workspace.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-services-wfs-syn-workspace.xml index 01d1c7f7adf775efe846922fd9d9ca745b362b83..7eae9d697721212f16c79c0c8fec805eb6d579b1 100644 --- a/xplan-workspaces/src/main/assembly/xplansyn-wfs-workspace.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-services-wfs-syn-workspace.xml @@ -20,7 +20,7 @@ --> <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>xplansyn-wfs-workspace</id> + <id>xplan-services-wfs-syn-workspace</id> <formats> <format>zip</format> </formats> @@ -61,8 +61,9 @@ </fileSets> <dependencySets> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <includes> - <include>de.latlon.product.xplanbox:xplan-schemas</include> + <include>de.latlon.product.xplanbox:xplan-core-schemas</include> </includes> <unpack>true</unpack> <outputDirectory>/</outputDirectory> diff --git a/xplan-workspaces/src/main/assembly/xplan-wfs-workspace.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-services-wfs-workspace.xml similarity index 94% rename from xplan-workspaces/src/main/assembly/xplan-wfs-workspace.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-services-wfs-workspace.xml index 79a3bcb7c24b3767d961476de9731a013942811d..fa2eb5c6a73abdb4fcf74a7e393682f085a898b6 100644 --- a/xplan-workspaces/src/main/assembly/xplan-wfs-workspace.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-services-wfs-workspace.xml @@ -20,7 +20,7 @@ --> <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-wfs-workspace</id> + <id>xplan-services-wfs-workspace</id> <formats> <format>zip</format> </formats> @@ -67,8 +67,9 @@ </fileSets> <dependencySets> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <includes> - <include>de.latlon.product.xplanbox:xplan-schemas</include> + <include>de.latlon.product.xplanbox:xplan-core-schemas</include> </includes> <unpack>true</unpack> <outputDirectory>/</outputDirectory> diff --git a/xplan-workspaces/src/main/assembly/xplansyn-wms-workspace.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-services-wms-workspace.xml similarity index 96% rename from xplan-workspaces/src/main/assembly/xplansyn-wms-workspace.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-services-wms-workspace.xml index 6dfeeed5b4f671198f0dc8500d08ddc43ae67be4..cdd0d089b7ed66d9f4725b796c46b819f554778d 100644 --- a/xplan-workspaces/src/main/assembly/xplansyn-wms-workspace.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-services-wms-workspace.xml @@ -20,7 +20,7 @@ --> <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>xplansyn-wms-workspace</id> + <id>xplan-services-wms-workspace</id> <formats> <format>zip</format> </formats> @@ -91,8 +91,9 @@ </fileSets> <dependencySets> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <includes> - <include>de.latlon.product.xplanbox:xplan-schemas</include> + <include>de.latlon.product.xplanbox:xplan-core-schemas</include> </includes> <unpack>true</unpack> <unpackOptions> diff --git a/xplan-workspaces/src/main/assembly/xplan-validator-workspace.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-validator-workspace.xml similarity index 94% rename from xplan-workspaces/src/main/assembly/xplan-validator-workspace.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-validator-workspace.xml index b0a04f8a858ad4198ffffee727bea51d4486462a..978120167b8532f8ec9442c707b3f56284173f36 100644 --- a/xplan-workspaces/src/main/assembly/xplan-validator-workspace.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-validator-workspace.xml @@ -42,8 +42,9 @@ </fileSets> <dependencySets> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <includes> - <include>de.latlon.product.xplanbox:xplan-schemas</include> + <include>de.latlon.product.xplanbox:xplan-core-schemas</include> </includes> <unpack>true</unpack> <unpackOptions> diff --git a/xplan-workspaces/src/main/assembly/xplan-inspireplu-workspace.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-webservices-inspireplu-workspace.xml similarity index 98% rename from xplan-workspaces/src/main/assembly/xplan-inspireplu-workspace.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-webservices-inspireplu-workspace.xml index 1a0286547e806a1ce7e2d290c33bd430f16728d6..c744517fde758b395999e838ab165fcd15e3d6e1 100644 --- a/xplan-workspaces/src/main/assembly/xplan-inspireplu-workspace.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-webservices-inspireplu-workspace.xml @@ -20,7 +20,7 @@ --> <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-inspireplu-workspace</id> + <id>xplan-webservices-inspireplu-workspace</id> <formats> <format>zip</format> </formats> diff --git a/xplan-workspaces/src/main/assembly/xplan-validator-wms-memory-workspace.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-webservices-validator-wms-memory-workspace.xml similarity index 94% rename from xplan-workspaces/src/main/assembly/xplan-validator-wms-memory-workspace.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-webservices-validator-wms-memory-workspace.xml index 70e76e44a53ba3368638ffe82472129f80a74162..75d6658c77a87c48e73984b08f95bf61e8f9ec3e 100644 --- a/xplan-workspaces/src/main/assembly/xplan-validator-wms-memory-workspace.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-webservices-validator-wms-memory-workspace.xml @@ -20,7 +20,7 @@ --> <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-validator-wms-memory-workspace</id> + <id>xplan-webservices-validator-wms-memory-workspace</id> <formats> <format>zip</format> </formats> @@ -74,8 +74,9 @@ </fileSets> <dependencySets> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <includes> - <include>de.latlon.product.xplanbox:xplan-schemas</include> + <include>de.latlon.product.xplanbox:xplan-core-schemas</include> </includes> <unpack>true</unpack> <outputDirectory>/</outputDirectory> diff --git a/xplan-workspaces/src/main/assembly/xplan-validator-wms-sql-workspace.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-webservices-validator-wms-sql-workspace.xml similarity index 95% rename from xplan-workspaces/src/main/assembly/xplan-validator-wms-sql-workspace.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-webservices-validator-wms-sql-workspace.xml index fb734536cadc6c6c24c7e75db168a2c3d8e932a8..8db7c4784a8c7a50a2a2a6963358e7a93e152756 100644 --- a/xplan-workspaces/src/main/assembly/xplan-validator-wms-sql-workspace.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/assembly/xplan-webservices-validator-wms-sql-workspace.xml @@ -20,7 +20,7 @@ --> <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-validator-wms-sql-workspace</id> + <id>xplan-webservices-validator-wms-sql-workspace</id> <formats> <format>zip</format> </formats> @@ -83,8 +83,9 @@ </fileSets> <dependencySets> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <includes> - <include>de.latlon.product.xplanbox:xplan-schemas</include> + <include>de.latlon.product.xplanbox:xplan-core-schemas</include> </includes> <unpack>true</unpack> <unpackOptions> diff --git a/xplan-workspaces/src/main/workspace/appschemas/inspireplu/PlannedLandUse.xsd b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/appschemas/inspireplu/PlannedLandUse.xsd similarity index 100% rename from xplan-workspaces/src/main/workspace/appschemas/inspireplu/PlannedLandUse.xsd rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/appschemas/inspireplu/PlannedLandUse.xsd diff --git a/xplan-workspaces/src/main/workspace/data/dummy.png b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/data/dummy.png similarity index 100% rename from xplan-workspaces/src/main/workspace/data/dummy.png rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/data/dummy.png diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-inspireplu/bbox_cache.properties b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/bbox_cache-inspireplu/bbox_cache.properties similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-inspireplu/bbox_cache.properties rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/bbox_cache-inspireplu/bbox_cache.properties diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplangml/bbox_cache.properties b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplangml/bbox_cache.properties similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplangml/bbox_cache.properties rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplangml/bbox_cache.properties diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplansyn/bbox_cache.properties b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplansyn/bbox_cache.properties similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplansyn/bbox_cache.properties rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/bbox_cache-xplansyn/bbox_cache.properties diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/inspireplu.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/inspireplu.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/inspireplu.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/inspireplu.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/inspireplu_view.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/inspireplu_view.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/inspireplu_view.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/inspireplu_view.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/validator-wms/memory/xplansyn.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/validator-wms/memory/xplansyn.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/validator-wms/memory/xplansyn.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/validator-wms/memory/xplansyn.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan40.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan40.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan40.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan40.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan40archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan40archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan40archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan40archive.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan40pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan40pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan40pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan40pre.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan41.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan41.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan41.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan41.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan41archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan41archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan41archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan41archive.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan41pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan41pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan41pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan41pre.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan50.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan50.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan50.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan50.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan50archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan50archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan50archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan50archive.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan50pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan50pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan50pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan50pre.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan51.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan51.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan51.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan51.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan51archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan51archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan51archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan51archive.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan51pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan51pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan51pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan51pre.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan52.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan52.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan52.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan52.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan52archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan52archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan52archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan52archive.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan52pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan52pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan52pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan52pre.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan53.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan53.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan53.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan53.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan53archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan53archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan53archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan53archive.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan53pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan53pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan53pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan53pre.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan54.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan54.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan54.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan54.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan54archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan54archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan54archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan54archive.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan54pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan54pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan54pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan54pre.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan60.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan60.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan60.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan60.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan60archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan60archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan60archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan60archive.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplan60pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan60pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplan60pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplan60pre.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplansyn.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplansyn.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplansyn.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplansyn.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplansynarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplansynarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplansynarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplansynarchive.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplansynpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplansynpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplansynpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplansynpre.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/feature/xplanvalidator.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplanvalidator.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/feature/xplanvalidator.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/feature/xplanvalidator.xml diff --git a/xplan-workspaces/src/main/workspace/datasources/remoteows/mapserver.ignore b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/remoteows/mapserver.ignore similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/remoteows/mapserver.ignore rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/remoteows/mapserver.ignore diff --git a/xplan-workspaces/src/main/workspace/datasources/tile/dummy.ignore b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/tile/dummy.ignore similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/tile/dummy.ignore rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/tile/dummy.ignore diff --git a/xplan-workspaces/src/main/workspace/datasources/tile/tilematrixset/dummy.ignore b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/tile/tilematrixset/dummy.ignore similarity index 100% rename from xplan-workspaces/src/main/workspace/datasources/tile/tilematrixset/dummy.ignore rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/datasources/tile/tilematrixset/dummy.ignore diff --git a/xplan-workspaces/src/main/workspace/gdal.ignore b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/gdal.ignore similarity index 100% rename from xplan-workspaces/src/main/workspace/gdal.ignore rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/gdal.ignore diff --git a/xplan-workspaces/src/main/workspace/jdbc/inspireplu.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/jdbc/inspireplu.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/jdbc/inspireplu.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/jdbc/inspireplu.xml diff --git a/xplan-workspaces/src/main/workspace/jdbc/manager/inspireplu.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/jdbc/manager/inspireplu.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/jdbc/manager/inspireplu.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/jdbc/manager/inspireplu.xml diff --git a/xplan-workspaces/src/main/workspace/jdbc/manager/inspireplucp.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/jdbc/manager/inspireplucp.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/jdbc/manager/inspireplucp.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/jdbc/manager/inspireplucp.xml diff --git a/xplan-workspaces/src/main/workspace/jdbc/manager/xplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/jdbc/manager/xplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/jdbc/manager/xplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/jdbc/manager/xplan.xml diff --git a/xplan-workspaces/src/main/workspace/jdbc/manager/xplancp.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/jdbc/manager/xplancp.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/jdbc/manager/xplancp.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/jdbc/manager/xplancp.xml diff --git a/xplan-workspaces/src/main/workspace/jdbc/xplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/jdbc/xplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/jdbc/xplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/jdbc/xplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/bplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/bplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/bplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/bplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/bplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/bplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/bplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/bplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/bplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/dummyrasterlayer.ignore b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/dummyrasterlayer.ignore similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/dummyrasterlayer.ignore rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/dummyrasterlayer.ignore diff --git a/xplan-workspaces/src/main/workspace/layers/fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/fplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/fplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/fplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/fplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/fplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/fplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/fplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/fplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/fplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/inspireplu.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/inspireplu.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/inspireplu.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/inspireplu.xml diff --git a/xplan-workspaces/src/main/workspace/layers/lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/lplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/lplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/lplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/lplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/lplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/lplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/lplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/lplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/lplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/mapserver.ignore b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/mapserver.ignore similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/mapserver.ignore rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/mapserver.ignore diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-bplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-bplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-bplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-bplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-bplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-bplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-fplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-fplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-fplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-fplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-fplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-fplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-lplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-lplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-lplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-lplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-lplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-lplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-rplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-rplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-rplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-rplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-rplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-rplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-soplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-soplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-soplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-soplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/bp-soplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/bp-soplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-bplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-bplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-bplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-bplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-bplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-bplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-fplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-fplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-fplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-fplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-fplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-fplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-lplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-lplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-lplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-lplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-lplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-lplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-rplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-rplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-rplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-rplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-rplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-rplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-soplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-soplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-soplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-soplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/fp-soplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/fp-soplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-bplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-bplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-bplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-bplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-bplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-bplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-fplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-fplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-fplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-fplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-fplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-fplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-lplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-lplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-lplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-lplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-lplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-lplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-rplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-rplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-rplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-rplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-rplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-rplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-soplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-soplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-soplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-soplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/lp-soplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/lp-soplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-bplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-bplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-bplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-bplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-bplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-bplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-fplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-fplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-fplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-fplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-fplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-fplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-lplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-lplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-lplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-lplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-lplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-lplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-rplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-rplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-rplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-rplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-rplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-rplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-soplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-soplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-soplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-soplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/rp-soplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/rp-soplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-bplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-bplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-bplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-bplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-bplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-bplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-fplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-fplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-fplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-fplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-fplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-fplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-lplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-lplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-lplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-lplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-lplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-lplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-rplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-rplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-rplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-rplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-rplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-rplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-soplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-soplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-soplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-soplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/planart-wms/so-soplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/planart-wms/so-soplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/rplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/rplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/rplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/rplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/rplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/rplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/rplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/rplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/rplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/soplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/soplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/soplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/soplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/soplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/layers/soplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/soplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/soplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/soplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/bp-bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/bp-bplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/bp-fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/bp-fplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/bp-lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/bp-lplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/bp-rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/bp-rplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/bp-soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/bp-soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/bp-soplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/fp-bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/fp-bplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/fp-fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/fp-fplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/fp-lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/fp-lplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/fp-rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/fp-rplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/fp-soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/fp-soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/fp-soplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/lp-bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/lp-bplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/lp-fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/lp-fplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/lp-lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/lp-lplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/lp-rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/lp-rplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/lp-soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/lp-soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/lp-soplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/rp-bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/rp-bplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/rp-fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/rp-fplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/rp-lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/rp-lplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/rp-rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/rp-rplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/rp-soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/rp-soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/rp-soplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/so-bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/so-bplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/so-fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/so-fplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/so-lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/so-lplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/so-rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/so-rplan.xml diff --git a/xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/so-soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/layers/validator-wms/sql/so-soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/layers/validator-wms/sql/so-soplan.xml diff --git a/xplan-workspaces/src/main/workspace/services/bpwms.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/bpwms.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/bpwms.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/bpwms.xml diff --git a/xplan-workspaces/src/main/workspace/services/bpwms_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/bpwms_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/bpwms_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/bpwms_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/bpwmsarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/bpwmsarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/bpwmsarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/bpwmsarchive.xml diff --git a/xplan-workspaces/src/main/workspace/services/bpwmsarchive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/bpwmsarchive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/bpwmsarchive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/bpwmsarchive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/bpwmspre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/bpwmspre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/bpwmspre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/bpwmspre.xml diff --git a/xplan-workspaces/src/main/workspace/services/bpwmspre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/bpwmspre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/bpwmspre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/bpwmspre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/downloadservice.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/downloadservice.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/downloadservice.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/downloadservice.xml diff --git a/xplan-workspaces/src/main/workspace/services/downloadservice_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/downloadservice_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/downloadservice_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/downloadservice_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/fpwms.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/fpwms.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/fpwms.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/fpwms.xml diff --git a/xplan-workspaces/src/main/workspace/services/fpwms_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/fpwms_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/fpwms_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/fpwms_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/fpwmsarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/fpwmsarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/fpwmsarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/fpwmsarchive.xml diff --git a/xplan-workspaces/src/main/workspace/services/fpwmsarchive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/fpwmsarchive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/fpwmsarchive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/fpwmsarchive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/fpwmspre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/fpwmspre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/fpwmspre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/fpwmspre.xml diff --git a/xplan-workspaces/src/main/workspace/services/fpwmspre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/fpwmspre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/fpwmspre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/fpwmspre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/html.gfi b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/html.gfi similarity index 100% rename from xplan-workspaces/src/main/workspace/services/html.gfi rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/html.gfi diff --git a/xplan-workspaces/src/main/workspace/services/inspirepluhtml.gfi b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/inspirepluhtml.gfi similarity index 100% rename from xplan-workspaces/src/main/workspace/services/inspirepluhtml.gfi rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/inspirepluhtml.gfi diff --git a/xplan-workspaces/src/main/workspace/services/lpwms.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/lpwms.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/lpwms.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/lpwms.xml diff --git a/xplan-workspaces/src/main/workspace/services/lpwms_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/lpwms_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/lpwms_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/lpwms_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/lpwmsarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/lpwmsarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/lpwmsarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/lpwmsarchive.xml diff --git a/xplan-workspaces/src/main/workspace/services/lpwmsarchive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/lpwmsarchive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/lpwmsarchive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/lpwmsarchive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/lpwmspre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/lpwmspre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/lpwmspre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/lpwmspre.xml diff --git a/xplan-workspaces/src/main/workspace/services/lpwmspre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/lpwmspre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/lpwmspre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/lpwmspre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/rpwms.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/rpwms.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/rpwms.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/rpwms.xml diff --git a/xplan-workspaces/src/main/workspace/services/rpwms_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/rpwms_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/rpwms_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/rpwms_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/rpwmsarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/rpwmsarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/rpwmsarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/rpwmsarchive.xml diff --git a/xplan-workspaces/src/main/workspace/services/rpwmsarchive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/rpwmsarchive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/rpwmsarchive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/rpwmsarchive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/rpwmspre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/rpwmspre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/rpwmspre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/rpwmspre.xml diff --git a/xplan-workspaces/src/main/workspace/services/rpwmspre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/rpwmspre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/rpwmspre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/rpwmspre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/sowms.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/sowms.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/sowms.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/sowms.xml diff --git a/xplan-workspaces/src/main/workspace/services/sowms_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/sowms_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/sowms_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/sowms_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/sowmsarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/sowmsarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/sowmsarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/sowmsarchive.xml diff --git a/xplan-workspaces/src/main/workspace/services/sowmsarchive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/sowmsarchive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/sowmsarchive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/sowmsarchive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/sowmspre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/sowmspre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/sowmspre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/sowmspre.xml diff --git a/xplan-workspaces/src/main/workspace/services/sowmspre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/sowmspre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/sowmspre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/sowmspre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/validator-wms/wms.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/validator-wms/wms.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/validator-wms/wms.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/validator-wms/wms.xml diff --git a/xplan-workspaces/src/main/workspace/services/validator-wms/wms_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/validator-wms/wms_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/validator-wms/wms_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/validator-wms/wms_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/viewservice.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/viewservice.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/viewservice.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/viewservice.xml diff --git a/xplan-workspaces/src/main/workspace/services/viewservice_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/viewservice_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/viewservice_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/viewservice_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs40.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs40.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs40.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs40.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs40_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs40_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs40_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs40_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs40archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs40archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs40archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs40archive.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs40archive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs40archive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs40archive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs40archive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs40pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs40pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs40pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs40pre.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs40pre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs40pre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs40pre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs40pre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs41.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs41.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs41.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs41.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs41_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs41_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs41_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs41_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs41archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs41archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs41archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs41archive.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs41archive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs41archive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs41archive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs41archive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs41pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs41pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs41pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs41pre.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs41pre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs41pre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs41pre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs41pre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs50.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs50.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs50.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs50.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs50_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs50_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs50_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs50_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs50archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs50archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs50archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs50archive.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs50archive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs50archive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs50archive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs50archive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs50pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs50pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs50pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs50pre.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs50pre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs50pre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs50pre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs50pre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs51.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs51.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs51.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs51.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs51_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs51_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs51_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs51_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs51archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs51archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs51archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs51archive.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs51archive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs51archive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs51archive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs51archive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs51pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs51pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs51pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs51pre.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs51pre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs51pre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs51pre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs51pre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs52.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs52.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs52.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs52.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs52_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs52_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs52_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs52_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs52archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs52archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs52archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs52archive.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs52archive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs52archive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs52archive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs52archive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs52pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs52pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs52pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs52pre.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs52pre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs52pre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs52pre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs52pre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs53.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs53.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs53.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs53.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs53_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs53_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs53_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs53_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs53archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs53archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs53archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs53archive.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs53archive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs53archive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs53archive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs53archive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs53pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs53pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs53pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs53pre.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs53pre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs53pre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs53pre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs53pre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs54.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs54.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs54.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs54.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs54_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs54_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs54_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs54_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs54archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs54archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs54archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs54archive.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs54archive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs54archive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs54archive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs54archive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs54pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs54pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs54pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs54pre.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs54pre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs54pre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs54pre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs54pre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs60.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs60.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs60.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs60.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs60_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs60_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs60_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs60_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs60archive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs60archive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs60archive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs60archive.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs60archive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs60archive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs60archive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs60archive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs60pre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs60pre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs60pre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs60pre.xml diff --git a/xplan-workspaces/src/main/workspace/services/wfs60pre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs60pre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wfs60pre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wfs60pre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wms.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wms.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wms.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wms.xml diff --git a/xplan-workspaces/src/main/workspace/services/wms_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wms_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wms_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wms_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wmsarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wmsarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wmsarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wmsarchive.xml diff --git a/xplan-workspaces/src/main/workspace/services/wmsarchive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wmsarchive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wmsarchive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wmsarchive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/wmspre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wmspre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wmspre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wmspre.xml diff --git a/xplan-workspaces/src/main/workspace/services/wmspre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wmspre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/wmspre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/wmspre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/xplansynwfs.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/xplansynwfs.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/xplansynwfs.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/xplansynwfs.xml diff --git a/xplan-workspaces/src/main/workspace/services/xplansynwfs_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/xplansynwfs_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/xplansynwfs_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/xplansynwfs_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/xplansynwfsarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/xplansynwfsarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/xplansynwfsarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/xplansynwfsarchive.xml diff --git a/xplan-workspaces/src/main/workspace/services/xplansynwfsarchive_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/xplansynwfsarchive_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/xplansynwfsarchive_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/xplansynwfsarchive_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/services/xplansynwfspre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/xplansynwfspre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/xplansynwfspre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/xplansynwfspre.xml diff --git a/xplan-workspaces/src/main/workspace/services/xplansynwfspre_metadata.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/xplansynwfspre_metadata.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/services/xplansynwfspre_metadata.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/services/xplansynwfspre_metadata.xml diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan40/internalId.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan40/internalId.xml similarity index 87% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan40/internalId.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan40/internalId.xml index c1669c5e038c4fb7e0dd3501902399a4b84134ae..00e104aaef4af28d68d264b6564be1118bfcce67 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan40/internalId.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan40/internalId.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:BP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:FP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:LP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:RP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan40/planId.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan40/planId.xml similarity index 86% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan40/planId.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan40/planId.xml index 59524e529248b15ed20cdf023b6f304ed1b9f623..613bdf237d34c224648917ddc640a4ca76a13d9f 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan40/planId.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan40/planId.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:BP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:FP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:LP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:RP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan40/planName.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan40/planName.xml similarity index 87% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan40/planName.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan40/planName.xml index 7aa999759aa6ca9a8b74c779a0ce12ba985c5f3a..4a91ff5373fa84afaceae34b788106cf2b1c650f 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan40/planName.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan40/planName.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:BP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:FP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:LP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:RP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan40:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan41/internalId.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan41/internalId.xml similarity index 87% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan41/internalId.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan41/internalId.xml index 3dc013a2b2f050eb4fff6a9bd407dc2acd46f3b8..2e906c1b7cd3594891007b11557371850a00a822 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan41/internalId.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan41/internalId.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:BP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:FP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:LP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:RP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan41/planId.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan41/planId.xml similarity index 86% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan41/planId.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan41/planId.xml index 93fd7030e2255de0cf7350b0a1fb5d870be983b6..499dc23b8bdc48bfc22131887851241070dfa74a 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan41/planId.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan41/planId.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:BP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:FP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:LP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:RP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan41/planName.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan41/planName.xml similarity index 87% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan41/planName.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan41/planName.xml index b9ce8ae2e9647e661dec2c0b110a4a406538d2b2..5b2dd3409b7376be80b38ec66ce31915c71486d0 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan41/planName.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan41/planName.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:BP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:FP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:LP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:RP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan41:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan50/internalId50.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan50/internalId50.xml similarity index 92% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan50/internalId50.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan50/internalId50.xml index 3ded751a76f42ac3d48beb1dee50b62ba28c9c48..22cb45b75aec3da7a5c2a9b73071935beb5aa6d1 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan50/internalId50.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan50/internalId50.xml @@ -31,7 +31,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan50:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan50:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -43,7 +43,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan50:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan50:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -55,7 +55,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan50:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan50:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -67,7 +67,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan50:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan50:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan50/planId50.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan50/planId50.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan50/planId50.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan50/planId50.xml index cb32242f5ff3b92e1014ffbabdf3fbec8a4808ea..0867e4839e6e6c999f07fc433302c01951ba342c 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan50/planId50.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan50/planId50.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan50:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan50:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan50:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan50:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan50:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan50:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan50:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan50:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan50/planName50.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan50/planName50.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan50/planName50.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan50/planName50.xml index 885c4296f9fcfdedb8c0fee7c2d1e10ea8bfa66f..8800679acd27ef5699417698599189da63796170 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan50/planName50.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan50/planName50.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan50:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan50:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan50:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan50:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan50:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan50:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan50:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan50:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan51/internalId51.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan51/internalId51.xml similarity index 92% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan51/internalId51.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan51/internalId51.xml index 17544ef1dfd7068298e08b95151d2353e86ad740..3e91ef8481ae4f2d42730c9d5d0058d6fc39b9a1 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan51/internalId51.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan51/internalId51.xml @@ -31,7 +31,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan51:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan51:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -43,7 +43,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan51:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan51:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -55,7 +55,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan51:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan51:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -67,7 +67,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan51:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan51:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan51/planId51.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan51/planId51.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan51/planId51.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan51/planId51.xml index 9d83139cf80eaac89fda63509f76d3fbc29d7994..0f12129b612bf64aed03539d06deb9d625152b76 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan51/planId51.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan51/planId51.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan51:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan51:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan51:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan51:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan51:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan51:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan51:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan51:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan51/planName51.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan51/planName51.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan51/planName51.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan51/planName51.xml index 04dceda62fea57f9bfc15f072cfd42546c2361f9..d0b7bd0b1f6897ee8de053f14620624e41784014 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan51/planName51.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan51/planName51.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan51:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan51:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan51:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan51:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan51:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan51:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan51:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan51:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan52/internalId52.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan52/internalId52.xml similarity index 92% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan52/internalId52.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan52/internalId52.xml index 65afbdf170dec9218091cea9a87978211826df37..e89e078b210ee580c76ecb2d81b452cc5a52f2f3 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan52/internalId52.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan52/internalId52.xml @@ -31,7 +31,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan52:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan52:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -43,7 +43,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan52:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan52:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -55,7 +55,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan52:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan52:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -67,7 +67,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan52:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan52:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan52/planId52.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan52/planId52.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan52/planId52.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan52/planId52.xml index 9f65245a9121f0ceb94ac07bcfc04f2e3922a998..7bf5da94d87cf2ce6eabacfcd794d8dd0e7b5edf 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan52/planId52.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan52/planId52.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan52:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan52:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan52:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan52:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan52:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan52:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan52:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan52:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan52/planName52.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan52/planName52.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan52/planName52.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan52/planName52.xml index 942d3a2b0b06e9bd72a37221aa58cc491d9fe098..1f9b2f13094d2de1b87b32a73cc6def0cf54cd8b 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan52/planName52.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan52/planName52.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan52:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan52:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan52:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan52:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan52:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan52:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan52:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan52:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan53/internalId53.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan53/internalId53.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan53/internalId53.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan53/internalId53.xml index 0829f89a7fd7d2bf7756a02f22ffc90d2c160241..921afc64312f635779c3c3b91bc4fdaa1ba1c279 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan53/internalId53.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan53/internalId53.xml @@ -31,7 +31,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan53:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan53:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -43,7 +43,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan53:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan53:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -55,7 +55,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan53:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan53:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -67,7 +67,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan53:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan53:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan53/planId53.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan53/planId53.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan53/planId53.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan53/planId53.xml index b371085f49438fe53943b429833b36b1a2c8d4e5..117e1f445e0766dc696fa542a3cc7cd4df15fb06 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan53/planId53.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan53/planId53.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan53:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan53:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan53:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan53:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan53:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan53:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan53:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan53:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan53/planName53.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan53/planName53.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan53/planName53.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan53/planName53.xml index e51e418599a2d2167c5da4d4cf0422b8505690ab..f8831a13c051d1fa1caff7692395ec7f1e9ad596 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan53/planName53.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan53/planName53.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan53:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan53:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan53:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan53:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan53:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan53:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan53:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan53:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan54/internalId54.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan54/internalId54.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan54/internalId54.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan54/internalId54.xml index 0bce211c75b2d5b9d32afd16c4c00b871a52e0fd..0f12d4a65049140506e8b370ed56ed9d8ee07935 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan54/internalId54.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan54/internalId54.xml @@ -31,7 +31,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan54:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan54:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -43,7 +43,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan54:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan54:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -55,7 +55,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan54:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan54:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -67,7 +67,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan54:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan54:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan54/planId54.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan54/planId54.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan54/planId54.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan54/planId54.xml index 969842d9884471b0de4e6ca32536292cae41cfed..abde5b56da814a64ec459585925cd11b0c7d9722 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan54/planId54.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan54/planId54.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan54:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan54:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan54:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan54:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan54:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan54:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan54:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan54:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan54/planName54.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan54/planName54.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan54/planName54.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan54/planName54.xml index f9a40644056ae11cf01c8485f94598057ea19304..c57c2b0264c062014630832fb016f6ee3217219a 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan54/planName54.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan54/planName54.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan54:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan54:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan54:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan54:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan54:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan54:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan54:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan54:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan60/internalId60.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan60/internalId60.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan60/internalId60.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan60/internalId60.xml index 5658f55d43ca39715a23c5b74b1b0ca90fcb3df7..9875ee45e6fea119f59fc8cf3fdfd12b09fbeefa 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan60/internalId60.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan60/internalId60.xml @@ -31,7 +31,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan60:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan60:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -43,7 +43,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan60:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan60:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -55,7 +55,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan60:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan60:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -67,7 +67,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan60:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan60:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan60/planId60.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan60/planId60.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan60/planId60.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan60/planId60.xml index 177ae668c66053b641556b93368d6e65cd437ef7..4426e2ed6060a2d584c88a30c91924efa31ce1c4 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan60/planId60.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan60/planId60.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan60:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan60:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan60:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan60:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan60:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan60:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan60:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan60:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplan60/planName60.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan60/planName60.xml similarity index 91% rename from xplan-workspaces/src/main/workspace/storedqueries/xplan60/planName60.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan60/planName60.xml index ce90541960a46ab7de186855e57da98ce75c8083..1cb55afcb503ddb5c9c47ec031a171e6fb298e65 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplan60/planName60.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplan60/planName60.xml @@ -30,7 +30,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query typeNames="xplan60:BP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan60:BP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -42,7 +42,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query typeNames="xplan60:FP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan60:FP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -54,7 +54,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query typeNames="xplan60:LP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan60:LP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> @@ -66,7 +66,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query typeNames="xplan60:RP_Plan"> + <wfs:Query srsName="${srsName}" typeNames="xplan60:RP_Plan"> <fes:Filter> <fes:PropertyIsEqualTo> <fes:ValueReference> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplansyn/internalId.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplansyn/internalId.xml similarity index 93% rename from xplan-workspaces/src/main/workspace/storedqueries/xplansyn/internalId.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplansyn/internalId.xml index 9faa3872e6ccacfe22fda4317bb919b86c11b69c..1549cb575d7d75a9284dd4a82d6464ea598f20ef 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplansyn/internalId.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplansyn/internalId.xml @@ -29,7 +29,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:BP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:BP_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -61,7 +61,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:FP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:FP_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -93,7 +93,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:LP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:LP_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -125,7 +125,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:RP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:RP_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planId.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplansyn/planId.xml similarity index 93% rename from xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planId.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplansyn/planId.xml index ed727892da18ce2a4538ea590fc62bb67f8a1f72..aba6e397cd905352802d73a63bc6bd4e969ec4ac 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planId.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplansyn/planId.xml @@ -29,7 +29,7 @@ language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> <!-- BP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:BP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:BP_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -61,7 +61,7 @@ </wfs:Query> <!-- FP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:FP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:FP_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -93,7 +93,7 @@ </wfs:Query> <!-- LP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:LP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:LP_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -125,7 +125,7 @@ </wfs:Query> <!-- RP_Plan --> - <wfs:Query xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:RP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:gml="http://www.opengis.net/gml/3.2" typeNames="xplan:RP_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planName.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplansyn/planName.xml similarity index 86% rename from xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planName.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplansyn/planName.xml index 24441ac00f27bb4a5707eb11f3b67449d574e0ea..cab41854f3cf9c63f833db542e308a645f8f1242 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planName.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplansyn/planName.xml @@ -24,7 +24,7 @@ <wfs:Abstract>planName (Mandatory)</wfs:Abstract> </wfs:Parameter> <wfs:QueryExpressionText returnFeatureTypes="${deegreewfs:ServedFeatureTypes}" language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AbgrabungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AbgrabungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -52,7 +52,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AbstandsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AbstandsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -80,7 +80,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AbstandsMass"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AbstandsMass"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -108,7 +108,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AbweichungVonBaugrenze"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AbweichungVonBaugrenze"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -136,7 +136,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AbweichungVonUeberbaubarerGrundstuecksFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AbweichungVonUeberbaubarerGrundstuecksFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -164,7 +164,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AnpflanzungBindungErhaltung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AnpflanzungBindungErhaltung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -192,7 +192,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AufschuettungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AufschuettungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -220,7 +220,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AusgleichsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AusgleichsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -248,7 +248,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AusgleichsMassnahme"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_AusgleichsMassnahme"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -276,7 +276,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_BauGrenze"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_BauGrenze"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -304,7 +304,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_BauLinie"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_BauLinie"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -332,7 +332,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Baugebiet"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Baugebiet"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -360,7 +360,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_BaugebietsTeilFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_BaugebietsTeilFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -388,7 +388,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Bereich"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Bereich"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -416,7 +416,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_BereichOhneEinAusfahrtLinie"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_BereichOhneEinAusfahrtLinie"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -444,7 +444,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_BesondererNutzungszweckFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_BesondererNutzungszweckFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -472,7 +472,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_BodenschaetzeFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_BodenschaetzeFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -500,7 +500,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_DenkmalschutzEinzelanlage"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_DenkmalschutzEinzelanlage"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -528,7 +528,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_DenkmalschutzEnsembleFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_DenkmalschutzEnsembleFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -556,7 +556,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_EinfahrtPunkt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_EinfahrtPunkt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -584,7 +584,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_EinfahrtsbereichLinie"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_EinfahrtsbereichLinie"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -612,7 +612,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_EingriffsBereich"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_EingriffsBereich"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -640,7 +640,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_ErhaltungsBereichFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_ErhaltungsBereichFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -668,7 +668,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_ErneuerbareEnergieFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_ErneuerbareEnergieFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -696,7 +696,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_FestsetzungNachLandesrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_FestsetzungNachLandesrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -724,7 +724,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_FirstRichtungsLinie"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_FirstRichtungsLinie"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -752,7 +752,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_FlaecheOhneFestsetzung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_FlaecheOhneFestsetzung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -780,7 +780,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_FoerderungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_FoerderungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -808,7 +808,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_FreiFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_FreiFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -836,7 +836,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GebaeudeFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GebaeudeFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -864,7 +864,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GebaeudeStellung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GebaeudeStellung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -892,7 +892,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GemeinbedarfsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GemeinbedarfsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -920,7 +920,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GemeinschaftsanlagenFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GemeinschaftsanlagenFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -948,7 +948,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GemeinschaftsanlagenZuordnung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GemeinschaftsanlagenZuordnung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -976,7 +976,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GenerischesObjekt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GenerischesObjekt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1004,7 +1004,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GewaesserFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GewaesserFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1032,7 +1032,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GruenFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_GruenFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1060,7 +1060,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_HoehenMass"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_HoehenMass"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1088,7 +1088,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Immissionsschutz"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Immissionsschutz"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1116,7 +1116,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_KennzeichnungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_KennzeichnungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1144,7 +1144,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_KleintierhaltungFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_KleintierhaltungFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1172,7 +1172,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Landwirtschaft"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Landwirtschaft"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1200,7 +1200,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_LandwirtschaftsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_LandwirtschaftsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1228,7 +1228,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_LuftreinhalteFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_LuftreinhalteFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1256,7 +1256,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_NebenanlagenAusschlussFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_NebenanlagenAusschlussFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1284,7 +1284,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_NebenanlagenFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_NebenanlagenFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1312,7 +1312,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_NichtUeberbaubareGrundstuecksflaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_NichtUeberbaubareGrundstuecksflaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1340,7 +1340,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_NutzungsartenGrenze"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_NutzungsartenGrenze"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1368,7 +1368,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_PersGruppenBestimmteFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_PersGruppenBestimmteFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1396,7 +1396,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1424,7 +1424,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_RasterplanAenderung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_RasterplanAenderung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1452,7 +1452,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_RegelungVergnuegungsstaetten"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_RegelungVergnuegungsstaetten"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1480,7 +1480,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_RekultivierungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_RekultivierungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1508,7 +1508,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_RichtungssektorGrenze"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_RichtungssektorGrenze"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1536,7 +1536,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_SchutzPflegeEntwicklungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_SchutzPflegeEntwicklungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1564,7 +1564,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_SchutzPflegeEntwicklungsMassnahme"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_SchutzPflegeEntwicklungsMassnahme"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1592,7 +1592,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Schutzgebiet"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Schutzgebiet"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1620,7 +1620,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Sichtflaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Sichtflaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1648,7 +1648,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_SpezielleBauweise"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_SpezielleBauweise"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1676,7 +1676,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_SpielSportanlagenFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_SpielSportanlagenFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1704,7 +1704,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_StrassenVerkehrsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_StrassenVerkehrsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1732,7 +1732,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_StrassenbegrenzungsLinie"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_StrassenbegrenzungsLinie"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1760,7 +1760,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Strassenkoerper"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Strassenkoerper"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1788,7 +1788,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_TechnischeMassnahmenFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_TechnischeMassnahmenFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1816,7 +1816,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_TextAbschnitt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_TextAbschnitt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1844,7 +1844,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_TextAbschnittFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_TextAbschnittFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1872,7 +1872,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_TextlicheFestsetzungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_TextlicheFestsetzungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1900,7 +1900,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_UeberbaubareGrundstuecksFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_UeberbaubareGrundstuecksFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1928,7 +1928,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_UnverbindlicheVormerkung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_UnverbindlicheVormerkung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1956,7 +1956,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_VerEntsorgung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_VerEntsorgung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -1984,7 +1984,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Veraenderungssperre"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Veraenderungssperre"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2012,7 +2012,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_VerkehrsflaecheBesondererZweckbestimmung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_VerkehrsflaecheBesondererZweckbestimmung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2040,7 +2040,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_WaldFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_WaldFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2068,7 +2068,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_WasserwirtschaftsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_WasserwirtschaftsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2096,7 +2096,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Wegerecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_Wegerecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2124,7 +2124,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_WohngebaeudeFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_WohngebaeudeFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2152,7 +2152,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_ZentralerVersorgungsbereich"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_ZentralerVersorgungsbereich"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2180,7 +2180,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_ZusatzkontingentLaerm"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_ZusatzkontingentLaerm"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2208,7 +2208,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_ZusatzkontingentLaermFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:BP_ZusatzkontingentLaermFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2236,7 +2236,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Abgrabung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Abgrabung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2264,7 +2264,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_AbgrabungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_AbgrabungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2292,7 +2292,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_AnpassungKlimawandel"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_AnpassungKlimawandel"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2320,7 +2320,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Aufschuettung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Aufschuettung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2348,7 +2348,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_AufschuettungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_AufschuettungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2376,7 +2376,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_AusgleichsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_AusgleichsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2404,7 +2404,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_BebauungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_BebauungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2432,7 +2432,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Bereich"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Bereich"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2460,7 +2460,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Bodenschaetze"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Bodenschaetze"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2488,7 +2488,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_BodenschaetzeFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_BodenschaetzeFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2516,7 +2516,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_DarstellungNachLandesrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_DarstellungNachLandesrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2544,7 +2544,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_FlaecheOhneDarstellung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_FlaecheOhneDarstellung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2572,7 +2572,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Gemeinbedarf"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Gemeinbedarf"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2600,7 +2600,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_GenerischesObjekt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_GenerischesObjekt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2628,7 +2628,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Gewaesser"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Gewaesser"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2656,7 +2656,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Gruen"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Gruen"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2684,7 +2684,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_KeineZentrAbwasserBeseitigungFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_KeineZentrAbwasserBeseitigungFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2712,7 +2712,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Kennzeichnung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Kennzeichnung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2740,7 +2740,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Landwirtschaft"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Landwirtschaft"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2768,7 +2768,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_LandwirtschaftsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_LandwirtschaftsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2796,7 +2796,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Nutzungsbeschraenkung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Nutzungsbeschraenkung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2824,7 +2824,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_NutzungsbeschraenkungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_NutzungsbeschraenkungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2852,7 +2852,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2880,7 +2880,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_PrivilegiertesVorhaben"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_PrivilegiertesVorhaben"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2908,7 +2908,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_RasterplanAenderung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_RasterplanAenderung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2936,7 +2936,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_SchutzPflegeEntwicklung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_SchutzPflegeEntwicklung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2964,7 +2964,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_SpielSportanlage"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_SpielSportanlage"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -2992,7 +2992,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Strassenverkehr"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Strassenverkehr"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3020,7 +3020,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_TextAbschnitt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_TextAbschnitt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3048,7 +3048,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_TextAbschnittFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_TextAbschnittFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3076,7 +3076,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_TextlicheDarstellungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_TextlicheDarstellungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3104,7 +3104,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_UnverbindlicheVormerkung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_UnverbindlicheVormerkung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3132,7 +3132,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_VerEntsorgung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_VerEntsorgung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3160,7 +3160,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_VorbehalteFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_VorbehalteFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3188,7 +3188,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_WaldFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_WaldFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3216,7 +3216,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Wasserwirtschaft"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_Wasserwirtschaft"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3244,7 +3244,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_ZentralerVersorgungsbereich"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:FP_ZentralerVersorgungsbereich"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3272,7 +3272,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Abgrenzung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Abgrenzung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3300,7 +3300,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_AllgGruenflaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_AllgGruenflaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3328,7 +3328,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_AnpflanzungBindungErhaltung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_AnpflanzungBindungErhaltung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3356,7 +3356,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Ausgleich"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Ausgleich"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3384,7 +3384,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Bereich"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Bereich"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3412,7 +3412,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_BiotopverbundBiotopvernetzung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_BiotopverbundBiotopvernetzung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3440,7 +3440,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Biotopverbundflaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Biotopverbundflaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3468,7 +3468,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Bodenschutzrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Bodenschutzrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3496,7 +3496,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Denkmalschutzrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Denkmalschutzrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3524,7 +3524,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Eingriffsregelung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Eingriffsregelung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3552,7 +3552,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_ErholungFreizeit"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_ErholungFreizeit"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3580,7 +3580,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Forstrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Forstrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3608,7 +3608,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_GenerischesObjekt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_GenerischesObjekt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3636,7 +3636,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Landschaftsbild"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Landschaftsbild"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3664,7 +3664,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_NutzungsAusschluss"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_NutzungsAusschluss"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3692,7 +3692,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_NutzungserfordernisRegelung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_NutzungserfordernisRegelung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3720,7 +3720,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3748,7 +3748,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_PlanerischeVertiefung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_PlanerischeVertiefung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3776,7 +3776,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_RasterplanAenderung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_RasterplanAenderung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3804,7 +3804,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_SchutzBestimmterTeileVonNaturUndLandschaft"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_SchutzBestimmterTeileVonNaturUndLandschaft"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3832,7 +3832,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_SchutzPflegeEntwicklung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_SchutzPflegeEntwicklung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3860,7 +3860,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_SchutzobjektBundesrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_SchutzobjektBundesrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3888,7 +3888,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_SchutzobjektInternatRecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_SchutzobjektInternatRecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3916,7 +3916,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_SonstigeAbgrenzuung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_SonstigeAbgrenzuung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3944,7 +3944,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_SonstigesRecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_SonstigesRecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -3972,7 +3972,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_TextAbschnitt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_TextAbschnitt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4000,7 +4000,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_TextAbschnittObjekt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_TextAbschnittObjekt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4028,7 +4028,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_TextlicheFestsetzungsFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_TextlicheFestsetzungsFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4056,7 +4056,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_WasserrechtGemeingebrEinschraenkungNaturschutz"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_WasserrechtGemeingebrEinschraenkungNaturschutz"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4084,7 +4084,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_WasserrechtSchutzgebiet"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_WasserrechtSchutzgebiet"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4112,7 +4112,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_WasserrechtSonstige"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_WasserrechtSonstige"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4140,7 +4140,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_WasserrechtWirtschaftAbflussHochwSchutz"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_WasserrechtWirtschaftAbflussHochwSchutz"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4168,7 +4168,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_ZieleErfordernisseMassnahmen"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_ZieleErfordernisseMassnahmen"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4196,7 +4196,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_ZuBegruenendeGrundstueckflaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_ZuBegruenendeGrundstueckflaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4224,7 +4224,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Zwischennutzung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:LP_Zwischennutzung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4252,7 +4252,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Achse"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Achse"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4280,7 +4280,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Bereich"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Bereich"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4308,7 +4308,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Bodenschutz"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Bodenschutz"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4336,7 +4336,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Einzelhandel"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Einzelhandel"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4364,7 +4364,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Energieversorgung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Energieversorgung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4392,7 +4392,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Entsorgung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Entsorgung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4420,7 +4420,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Erholung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Erholung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4448,7 +4448,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_ErneuerbareEnergie"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_ErneuerbareEnergie"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4476,7 +4476,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Forstwirtschaft"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Forstwirtschaft"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4504,7 +4504,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Freiraum"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Freiraum"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4532,7 +4532,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_FreizeitErholung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_FreizeitErholung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4560,7 +4560,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Funktionszuweisung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Funktionszuweisung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4588,7 +4588,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_GemeindeFunktionSiedlungsentwicklung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_GemeindeFunktionSiedlungsentwicklung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4616,7 +4616,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_GenerischesObjekt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_GenerischesObjekt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4644,7 +4644,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Gewaesser"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Gewaesser"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4672,7 +4672,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Grenze"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Grenze"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4700,7 +4700,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_GruenzugGruenzaesur"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_GruenzugGruenzaesur"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4728,7 +4728,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Hochwasserschutz"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Hochwasserschutz"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4756,7 +4756,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_IndustrieGewerbe"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_IndustrieGewerbe"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4784,7 +4784,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Klimaschutz"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Klimaschutz"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4812,7 +4812,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Kommunikation"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Kommunikation"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4840,7 +4840,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_KulturellesSachgut"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_KulturellesSachgut"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4868,7 +4868,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Kulturlandschaft"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Kulturlandschaft"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4896,7 +4896,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_LaermschutzBauschutz"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_LaermschutzBauschutz"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4924,7 +4924,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Laermschutzbereich"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Laermschutzbereich"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4952,7 +4952,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Landwirtschaft"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Landwirtschaft"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -4980,7 +4980,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Legendenobjekt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Legendenobjekt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5008,7 +5008,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Luftverkehr"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Luftverkehr"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5036,7 +5036,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_NaturLandschaft"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_NaturLandschaft"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5064,7 +5064,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_NaturschutzrechtlichesSchutzgebiet"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_NaturschutzrechtlichesSchutzgebiet"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5092,7 +5092,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Plan"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5120,7 +5120,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Planungsraum"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Planungsraum"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5148,7 +5148,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_RadwegWanderweg"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_RadwegWanderweg"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5176,7 +5176,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_RasterplanAenderung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_RasterplanAenderung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5204,7 +5204,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Raumkategorie"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Raumkategorie"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5232,7 +5232,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Rohstoff"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Rohstoff"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5260,7 +5260,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Rohstoffsicherung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Rohstoffsicherung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5288,7 +5288,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Schienenverkehr"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Schienenverkehr"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5316,7 +5316,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Siedlung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Siedlung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5344,7 +5344,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SonstVerkehr"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SonstVerkehr"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5372,7 +5372,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SonstigeInfrastruktur"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SonstigeInfrastruktur"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5400,7 +5400,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SonstigeSiedlungsstruktur"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SonstigeSiedlungsstruktur"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5428,7 +5428,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SonstigerFreiraumschutz"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SonstigerFreiraumschutz"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5456,7 +5456,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SonstigerFreiraumstruktur"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SonstigerFreiraumstruktur"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5484,7 +5484,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SonstigerSiedlungsbereich"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SonstigerSiedlungsbereich"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5512,7 +5512,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SozialeInfrastruktur"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_SozialeInfrastruktur"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5540,7 +5540,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Sperrgebiet"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Sperrgebiet"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5568,7 +5568,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Sportanlage"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Sportanlage"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5596,7 +5596,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Strassenverkehr"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Strassenverkehr"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5624,7 +5624,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_TextAbschnitt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_TextAbschnitt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5652,7 +5652,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Verkehr"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Verkehr"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5680,7 +5680,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_VorbHochwasserschutz"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_VorbHochwasserschutz"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5708,7 +5708,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Wasserschutz"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Wasserschutz"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5736,7 +5736,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Wasserverkehr"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Wasserverkehr"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5764,7 +5764,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Wasserwirtschaft"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Wasserwirtschaft"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5792,7 +5792,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Windenergienutzung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_Windenergienutzung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5820,7 +5820,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_WohnenSiedlung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_WohnenSiedlung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5848,7 +5848,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_ZentralerOrt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:RP_ZentralerOrt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5876,7 +5876,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Baubeschraenkung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Baubeschraenkung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5904,7 +5904,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Bauverbotszone"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Bauverbotszone"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5932,7 +5932,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Bereich"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Bereich"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5960,7 +5960,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Bodenschutzrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Bodenschutzrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -5988,7 +5988,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Denkmalschutzrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Denkmalschutzrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6016,7 +6016,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Forstrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Forstrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6044,7 +6044,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Gebiet"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Gebiet"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6072,7 +6072,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Gelaendemorphologie"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Gelaendemorphologie"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6100,7 +6100,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Gewaesser"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Gewaesser"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6128,7 +6128,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Grenze"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Grenze"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6156,7 +6156,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Linienobjekt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Linienobjekt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6184,7 +6184,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Luftverkehrsrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Luftverkehrsrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6212,7 +6212,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Objekt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Objekt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6240,7 +6240,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Plan"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Plan"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6268,7 +6268,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_RasterplanAenderung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_RasterplanAenderung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6296,7 +6296,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Schienenverkehrsrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Schienenverkehrsrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6324,7 +6324,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_SchutzgebietNaturschutzrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_SchutzgebietNaturschutzrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6352,7 +6352,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_SchutzgebietSonstigesRecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_SchutzgebietSonstigesRecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6380,7 +6380,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_SchutzgebietWasserrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_SchutzgebietWasserrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6408,7 +6408,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Sichtflaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Sichtflaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6436,7 +6436,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_SonstigesRecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_SonstigesRecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6464,7 +6464,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Strassenverkehr"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Strassenverkehr"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6492,7 +6492,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Strassenverkehrsrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Strassenverkehrsrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6520,7 +6520,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_TextAbschnitt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_TextAbschnitt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6548,7 +6548,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_TextAbschnittFlaeche"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_TextAbschnittFlaeche"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6576,7 +6576,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Wasserrecht"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Wasserrecht"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6604,7 +6604,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Wasserwirtschaft"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:SO_Wasserwirtschaft"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6632,7 +6632,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_BegruendungAbschnitt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_BegruendungAbschnitt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6660,7 +6660,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_FPO"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_FPO"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6688,7 +6688,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_LPO"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_LPO"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6716,7 +6716,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_LTO"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_LTO"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6744,7 +6744,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_Nutzungsschablone"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_Nutzungsschablone"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6772,7 +6772,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_PPO"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_PPO"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6800,7 +6800,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_PTO"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_PTO"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6828,7 +6828,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_Praesentationsobjekt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_Praesentationsobjekt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6856,7 +6856,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_Rasterdarstellung"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_Rasterdarstellung"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6884,7 +6884,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_RasterplanBasis"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_RasterplanBasis"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> @@ -6912,7 +6912,7 @@ </fes:And> </fes:Filter> </wfs:Query> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_TextAbschnitt"> + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="xplan:XP_TextAbschnitt"> <fes:Filter> <fes:And> <fes:PropertyIsEqualTo> diff --git a/xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planNameAndType.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplansyn/planNameAndType.xml similarity index 96% rename from xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planNameAndType.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplansyn/planNameAndType.xml index d083cbb87d01b2ef79ae38c5074be47197d5deb7..a1c3f487f5e60875e99e22937b395fb13ea72226 100644 --- a/xplan-workspaces/src/main/workspace/storedqueries/xplansyn/planNameAndType.xml +++ b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/storedqueries/xplansyn/planNameAndType.xml @@ -28,7 +28,7 @@ </wfs:Parameter> <wfs:QueryExpressionText returnFeatureTypes="${deegreewfs:ServedFeatureTypes}" language="urn:ogc:def:queryLanguage:OGC-WFS::WFS_QueryExpression" isPrivate="false"> - <wfs:Query xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" + <wfs:Query srsName="${srsName}" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:xplan="http://www.deegree.org/xplanung/1/0" typeNames="${typeNames}"> <fes:Filter> <fes:And> diff --git a/xplan-workspaces/src/main/workspace/styles/inspireplu/LU_SpatialPlan_Default.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/inspireplu/LU_SpatialPlan_Default.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/inspireplu/LU_SpatialPlan_Default.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/inspireplu/LU_SpatialPlan_Default.xml diff --git a/xplan-workspaces/src/main/workspace/styles/inspireplu/LU_SupplementaryRegulation_Default.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/inspireplu/LU_SupplementaryRegulation_Default.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/inspireplu/LU_SupplementaryRegulation_Default.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/inspireplu/LU_SupplementaryRegulation_Default.xml diff --git a/xplan-workspaces/src/main/workspace/styles/inspireplu/LU_ZoningElement_Default.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/inspireplu/LU_ZoningElement_Default.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/inspireplu/LU_ZoningElement_Default.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/inspireplu/LU_ZoningElement_Default.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abgrabungsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abgrabungsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abgrabungsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abgrabungsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abstandsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abstandsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abstandsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abstandsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abstandsmass.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abstandsmass.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abstandsmass.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abstandsmass.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abwbaugr.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abwbaugr.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abwbaugr.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abwbaugr.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abwueberbaubarergrundstuecksfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abwueberbaubarergrundstuecksfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abwueberbaubarergrundstuecksfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abwueberbaubarergrundstuecksfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abwueberbauberergrundstuecksfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abwueberbauberergrundstuecksfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abwueberbauberergrundstuecksfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_abwueberbauberergrundstuecksfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_anpflanzbinderh.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_anpflanzbinderh.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_anpflanzbinderh.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_anpflanzbinderh.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_aufschuettsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_aufschuettsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_aufschuettsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_aufschuettsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ausgleichsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ausgleichsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ausgleichsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ausgleichsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ausgleichsmassn.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ausgleichsmassn.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ausgleichsmassn.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ausgleichsmassn.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baugeb.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baugeb.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baugeb.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baugeb.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baugebteilfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baugebteilfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baugebteilfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baugebteilfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baugr.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baugr.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baugr.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baugr.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baulin.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baulin.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baulin.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_baulin.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ber.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ber.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ber.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ber.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_berohneeinausflin.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_berohneeinausflin.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_berohneeinausflin.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_berohneeinausflin.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_besnutzzweckfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_besnutzzweckfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_besnutzzweckfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_besnutzzweckfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_bsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_bsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_bsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_bsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_denkmscheinzanl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_denkmscheinzanl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_denkmscheinzanl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_denkmscheinzanl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_denkmschensfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_denkmschensfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_denkmschensfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_denkmschensfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_einfberlin.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_einfberlin.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_einfberlin.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_einfberlin.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_einfpt.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_einfpt.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_einfpt.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_einfpt.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_eingriffsber.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_eingriffsber.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_eingriffsber.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_eingriffsber.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_erhsberfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_erhsberfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_erhsberfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_erhsberfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_erneuerbenergiefl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_erneuerbenergiefl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_erneuerbenergiefl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_erneuerbenergiefl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_festsland.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_festsland.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_festsland.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_festsland.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_firstrilin.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_firstrilin.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_firstrilin.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_firstrilin.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_flaecheohnefestsetzung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_flaecheohnefestsetzung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_flaecheohnefestsetzung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_flaecheohnefestsetzung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_foerderfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_foerderfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_foerderfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_foerderfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_freifl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_freifl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_freifl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_freifl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gebaeudefl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gebaeudefl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gebaeudefl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gebaeudefl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gebaeudestellung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gebaeudestellung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gebaeudestellung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gebaeudestellung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gemanlfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gemanlfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gemanlfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gemanlfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gemanlzu.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gemanlzu.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gemanlzu.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gemanlzu.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gembedarfsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gembedarfsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gembedarfsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gembedarfsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_genobj.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_genobj.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_genobj.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_genobj.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gewfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gewfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gewfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gewfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gruenfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gruenfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gruenfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_gruenfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_hoehenmass.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_hoehenmass.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_hoehenmass.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_hoehenmass.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_immsschutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_immsschutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_immsschutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_immsschutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_kennzsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_kennzsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_kennzsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_kennzsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_kleintierhfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_kleintierhfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_kleintierhfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_kleintierhfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_luftreinhfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_luftreinhfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_luftreinhfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_luftreinhfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_lw.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_lw.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_lw.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_lw.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_lwfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_lwfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_lwfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_lwfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nebenanlausschlfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nebenanlausschlfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nebenanlausschlfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nebenanlausschlfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nebenanlfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nebenanlfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nebenanlfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nebenanlfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nichtueberbaubgrundstsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nichtueberbaubgrundstsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nichtueberbaubgrundstsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nichtueberbaubgrundstsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nutzartgr.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nutzartgr.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nutzartgr.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_nutzartgr.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_persgrbestfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_persgrbestfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_persgrbestfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_persgrbestfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_plan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_plan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_plan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_plan.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_rasterplanaenderung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_rasterplanaenderung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_rasterplanaenderung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_rasterplanaenderung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_regvergstaett.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_regvergstaett.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_regvergstaett.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_regvergstaett.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_rekultivierungsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_rekultivierungsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_rekultivierungsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_rekultivierungsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_richtungssektorgrenze.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_richtungssektorgrenze.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_richtungssektorgrenze.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_richtungssektorgrenze.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_schutzgeb.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_schutzgeb.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_schutzgeb.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_schutzgeb.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_schutzpflentwfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_schutzpflentwfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_schutzpflentwfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_schutzpflentwfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_schutzpflentwmassn.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_schutzpflentwmassn.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_schutzpflentwmassn.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_schutzpflentwmassn.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_sichtflaeche.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_sichtflaeche.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_sichtflaeche.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_sichtflaeche.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_speziellebauweise.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_speziellebauweise.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_speziellebauweise.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_speziellebauweise.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_spispoanlfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_spispoanlfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_spispoanlfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_spispoanlfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strbegrlin.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strbegrlin.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strbegrlin.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strbegrlin.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strkoerper.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strkoerper.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strkoerper.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strkoerper.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strverksfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strverksfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strverksfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_strverksfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_techmassnfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_techmassnfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_techmassnfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_techmassnfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_textabschnittflaeche.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_textabschnittflaeche.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_textabschnittflaeche.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_textabschnittflaeche.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_textlfestsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_textlfestsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_textlfestsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_textlfestsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ueberbaubgrundstsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ueberbaubgrundstsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ueberbaubgrundstsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_ueberbaubgrundstsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_unverbindlvormerk.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_unverbindlvormerk.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_unverbindlvormerk.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_unverbindlvormerk.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_veraendsper.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_veraendsper.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_veraendsper.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_veraendsper.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_verentsorgung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_verentsorgung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_verentsorgung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_verentsorgung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_verksflbeszwb.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_verksflbeszwb.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_verksflbeszwb.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_verksflbeszwb.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_waldfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_waldfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_waldfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_waldfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_wegerecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_wegerecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_wegerecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_wegerecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_wohngebaeudefl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_wohngebaeudefl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_wohngebaeudefl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_wohngebaeudefl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_wwssfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_wwssfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_wwssfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_wwssfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_fpo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_fpo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_fpo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_fpo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_lpo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_lpo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_lpo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_lpo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_lto.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_lto.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_lto.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_lto.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_ppo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_ppo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_ppo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_ppo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_pto.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_pto.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_pto.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_xp_pto.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_zentralerversorgungsbereich.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_zentralerversorgungsbereich.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_zentralerversorgungsbereich.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_zentralerversorgungsbereich.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_zusatzkontingentlaerm.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_zusatzkontingentlaerm.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_zusatzkontingentlaerm.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_zusatzkontingentlaerm.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_zusatzkontingentlaermfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_zusatzkontingentlaermfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_zusatzkontingentlaermfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/bp/bp_zusatzkontingentlaermfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_abgrabung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_abgrabung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_abgrabung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_abgrabung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_abgrabungsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_abgrabungsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_abgrabungsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_abgrabungsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_anpassklimaw.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_anpassklimaw.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_anpassklimaw.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_anpassklimaw.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_aufschuettsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_aufschuettsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_aufschuettsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_aufschuettsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_aufschuettung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_aufschuettung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_aufschuettung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_aufschuettung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_ausgleichsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_ausgleichsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_ausgleichsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_ausgleichsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_bebausfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_bebausfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_bebausfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_bebausfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_ber.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_ber.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_ber.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_ber.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_bs.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_bs.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_bs.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_bs.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_bsfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_bsfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_bsfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_bsfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_darstellungnachlandesrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_darstellungnachlandesrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_darstellungnachlandesrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_darstellungnachlandesrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_flaecheohnedarstellung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_flaecheohnedarstellung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_flaecheohnedarstellung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_flaecheohnedarstellung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_gembedarf.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_gembedarf.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_gembedarf.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_gembedarf.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_genobj.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_genobj.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_genobj.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_genobj.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_gew.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_gew.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_gew.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_gew.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_gruen.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_gruen.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_gruen.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_gruen.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_keinezentrabwbesfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_keinezentrabwbesfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_keinezentrabwbesfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_keinezentrabwbesfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_kennz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_kennz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_kennz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_kennz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_lw.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_lw.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_lw.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_lw.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_lwfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_lwfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_lwfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_lwfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_nutzbeschraenkfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_nutzbeschraenkfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_nutzbeschraenkfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_nutzbeschraenkfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_nutzungsbeschraenkung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_nutzungsbeschraenkung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_nutzungsbeschraenkung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_nutzungsbeschraenkung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_plan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_plan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_plan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_plan.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_privvorh.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_privvorh.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_privvorh.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_privvorh.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_rasterplanaender.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_rasterplanaender.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_rasterplanaender.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_rasterplanaender.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_schutzpflentw.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_schutzpflentw.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_schutzpflentw.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_schutzpflentw.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_spispoanl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_spispoanl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_spispoanl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_spispoanl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_strverk.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_strverk.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_strverk.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_strverk.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_textabschn.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_textabschn.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_textabschn.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_textabschn.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_textabschnittflaeche.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_textabschnittflaeche.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_textabschnittflaeche.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_textabschnittflaeche.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_textldarstfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_textldarstfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_textldarstfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_textldarstfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_unverbindlvormerk.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_unverbindlvormerk.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_unverbindlvormerk.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_unverbindlvormerk.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_verentsorgung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_verentsorgung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_verentsorgung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_verentsorgung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_vorbehaltefl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_vorbehaltefl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_vorbehaltefl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_vorbehaltefl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_waldfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_waldfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_waldfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_waldfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_wws.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_wws.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_wws.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_wws.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_fpo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_fpo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_fpo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_fpo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_lpo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_lpo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_lpo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_lpo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_lto.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_lto.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_lto.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_lto.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_ppo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_ppo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_ppo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_ppo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_pto.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_pto.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_pto.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_xp_pto.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_zentrversber.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_zentrversber.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_zentrversber.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/fp/fp_zentrversber.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_abgrenzung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_abgrenzung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_abgrenzung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_abgrenzung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_allggruenfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_allggruenfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_allggruenfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_allggruenfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_anpflanzbinderh.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_anpflanzbinderh.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_anpflanzbinderh.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_anpflanzbinderh.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_ausgleich.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_ausgleich.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_ausgleich.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_ausgleich.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_ber.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_ber.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_ber.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_ber.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_biotopverbundbiotopvernetzung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_biotopverbundbiotopvernetzung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_biotopverbundbiotopvernetzung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_biotopverbundbiotopvernetzung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_biotopverbundfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_biotopverbundfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_biotopverbundfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_biotopverbundfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_bodenschutzrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_bodenschutzrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_bodenschutzrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_bodenschutzrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_denkmschrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_denkmschrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_denkmschrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_denkmschrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_eingriffsregelung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_eingriffsregelung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_eingriffsregelung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_eingriffsregelung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_erholungfreizeit.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_erholungfreizeit.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_erholungfreizeit.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_erholungfreizeit.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_forstrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_forstrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_forstrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_forstrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_genobj.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_genobj.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_genobj.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_genobj.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_landschaftsbild.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_landschaftsbild.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_landschaftsbild.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_landschaftsbild.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_nutzausschl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_nutzausschl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_nutzausschl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_nutzausschl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_nutzerforderregelung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_nutzerforderregelung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_nutzerforderregelung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_nutzerforderregelung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_plan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_plan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_plan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_plan.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_planerischevertief.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_planerischevertief.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_planerischevertief.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_planerischevertief.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_rasterplanaender.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_rasterplanaender.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_rasterplanaender.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_rasterplanaender.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_rasterplanaenderung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_rasterplanaenderung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_rasterplanaenderung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_rasterplanaenderung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzbestimmterteilevonnaturundlandschaft.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzbestimmterteilevonnaturundlandschaft.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzbestimmterteilevonnaturundlandschaft.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzbestimmterteilevonnaturundlandschaft.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzobjbundesrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzobjbundesrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzobjbundesrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzobjbundesrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzobjinterrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzobjinterrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzobjinterrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzobjinterrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzpflentw.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzpflentw.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzpflentw.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_schutzpflentw.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_sonstsrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_sonstsrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_sonstsrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_sonstsrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_textabschn.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_textabschn.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_textabschn.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_textabschn.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_textabschnittobjekt.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_textabschnittobjekt.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_textabschnittobjekt.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_textabschnittobjekt.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrgemgebreinschrnats.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrgemgebreinschrnats.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrgemgebreinschrnats.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrgemgebreinschrnats.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrschutzgeb.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrschutzgeb.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrschutzgeb.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrschutzgeb.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrsonst.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrsonst.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrsonst.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrsonst.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrwirtschabflusshws.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrwirtschabflusshws.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrwirtschabflusshws.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_wrwirtschabflusshws.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_fpo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_fpo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_fpo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_fpo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_lpo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_lpo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_lpo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_lpo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_lto.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_lto.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_lto.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_lto.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_ppo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_ppo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_ppo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_ppo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_pto.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_pto.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_pto.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_xp_pto.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_zieleerfordernissemassnahmen.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_zieleerfordernissemassnahmen.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_zieleerfordernissemassnahmen.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_zieleerfordernissemassnahmen.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_zubegruenendegrundstueckflaeche.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_zubegruenendegrundstueckflaeche.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_zubegruenendegrundstueckflaeche.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_zubegruenendegrundstueckflaeche.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_zwischennutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_zwischennutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_zwischennutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lp_zwischennutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_biotopschutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_biotopschutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_biotopschutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_biotopschutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_brachfl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_brachfl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_brachfl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_brachfl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_elkulturlandsch.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_elkulturlandsch.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_elkulturlandsch.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_elkulturlandsch.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_forstlichefests.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_forstlichefests.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_forstlichefests.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_forstlichefests.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_herrigrundst.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_herrigrundst.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_herrigrundst.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_herrigrundst.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_pflegeanpflanz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_pflegeanpflanz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_pflegeanpflanz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_pflegeanpflanz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_pflegelandschbild.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_pflegelandschbild.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_pflegelandschbild.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_pflegelandschbild.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_schutzobjlandrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_schutzobjlandrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_schutzobjlandrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_schutzobjlandrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_sonstmassn.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_sonstmassn.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_sonstmassn.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_sonstmassn.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_struktelbesiedber.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_struktelbesiedber.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_struktelbesiedber.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_struktelbesiedber.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_templandschschutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_templandschschutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_templandschschutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_templandschschutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_verpflichtungwrrl.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_verpflichtungwrrl.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_verpflichtungwrrl.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/lp/lpnw_verpflichtungwrrl.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_achse.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_achse.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_achse.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_achse.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_ber.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_ber.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_ber.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_ber.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_bodenschutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_bodenschutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_bodenschutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_bodenschutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_einzelhandel.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_einzelhandel.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_einzelhandel.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_einzelhandel.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_energieversorgung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_energieversorgung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_energieversorgung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_energieversorgung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_entsorgung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_entsorgung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_entsorgung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_entsorgung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_erholung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_erholung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_erholung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_erholung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_erneuerbareenergie.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_erneuerbareenergie.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_erneuerbareenergie.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_erneuerbareenergie.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_forstwirtsch.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_forstwirtsch.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_forstwirtsch.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_forstwirtsch.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_freiraum.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_freiraum.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_freiraum.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_freiraum.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_freizeiterholung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_freizeiterholung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_freizeiterholung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_freizeiterholung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_funktionszuweisung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_funktionszuweisung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_funktionszuweisung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_funktionszuweisung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gemfunktsiedlentw.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gemfunktsiedlentw.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gemfunktsiedlentw.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gemfunktsiedlentw.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_genobj.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_genobj.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_genobj.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_genobj.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gewaesser.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gewaesser.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gewaesser.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gewaesser.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gr.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gr.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gr.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gr.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gruenzuggruenzaesur.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gruenzuggruenzaesur.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gruenzuggruenzaesur.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_gruenzuggruenzaesur.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_hochwasserschutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_hochwasserschutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_hochwasserschutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_hochwasserschutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_industriegewerbe.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_industriegewerbe.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_industriegewerbe.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_industriegewerbe.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_klimaschutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_klimaschutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_klimaschutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_klimaschutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_kommunikation.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_kommunikation.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_kommunikation.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_kommunikation.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_kulturellessachgut.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_kulturellessachgut.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_kulturellessachgut.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_kulturellessachgut.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_kulturlandschaft.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_kulturlandschaft.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_kulturlandschaft.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_kulturlandschaft.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_laermschutzbauschutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_laermschutzbauschutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_laermschutzbauschutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_laermschutzbauschutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_laermschutzber.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_laermschutzber.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_laermschutzber.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_laermschutzber.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_luftverkehr.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_luftverkehr.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_luftverkehr.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_luftverkehr.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_lw.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_lw.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_lw.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_lw.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_natsrechtlschutzgeb.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_natsrechtlschutzgeb.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_natsrechtlschutzgeb.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_natsrechtlschutzgeb.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_naturlandsch.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_naturlandsch.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_naturlandsch.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_naturlandsch.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_plan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_plan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_plan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_plan.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_planungsraum.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_planungsraum.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_planungsraum.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_planungsraum.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_radwegwanderweg.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_radwegwanderweg.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_radwegwanderweg.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_radwegwanderweg.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_raumkategorie.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_raumkategorie.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_raumkategorie.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_raumkategorie.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_rohstoff.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_rohstoff.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_rohstoff.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_rohstoff.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_rohstoffsicherung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_rohstoffsicherung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_rohstoffsicherung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_rohstoffsicherung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_schienenverkehr.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_schienenverkehr.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_schienenverkehr.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_schienenverkehr.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_siedlung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_siedlung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_siedlung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_siedlung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstfreiraumschutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstfreiraumschutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstfreiraumschutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstfreiraumschutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstinfrastrukt.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstinfrastrukt.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstinfrastrukt.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstinfrastrukt.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstrfreiraumstrukt.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstrfreiraumstrukt.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstrfreiraumstrukt.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstrfreiraumstrukt.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstsiedlbereich.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstsiedlbereich.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstsiedlbereich.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstsiedlbereich.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstsiedlstrukt.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstsiedlstrukt.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstsiedlstrukt.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstsiedlstrukt.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstverkehr.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstverkehr.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstverkehr.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sonstverkehr.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sozinfrastrukt.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sozinfrastrukt.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sozinfrastrukt.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sozinfrastrukt.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sperrgebiet.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sperrgebiet.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sperrgebiet.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sperrgebiet.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sportanlage.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sportanlage.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sportanlage.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_sportanlage.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_strassenverkehr.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_strassenverkehr.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_strassenverkehr.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_strassenverkehr.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_verk.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_verk.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_verk.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_verk.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_vorbhwschutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_vorbhwschutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_vorbhwschutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_vorbhwschutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wasserschutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wasserschutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wasserschutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wasserschutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wasserverkehr.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wasserverkehr.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wasserverkehr.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wasserverkehr.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_windenergienutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_windenergienutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_windenergienutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_windenergienutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wohnensiedlung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wohnensiedlung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wohnensiedlung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wohnensiedlung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wws.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wws.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wws.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_wws.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_fpo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_fpo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_fpo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_fpo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_lpo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_lpo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_lpo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_lpo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_lto.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_lto.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_lto.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_lto.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_ppo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_ppo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_ppo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_ppo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_pto.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_pto.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_pto.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_xp_pto.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_zentralerort.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_zentralerort.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_zentralerort.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rp_zentralerort.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_asb.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_asb.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_asb.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_asb.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_aufschuettablager.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_aufschuettablager.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_aufschuettablager.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_aufschuettablager.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_forstwirtsch.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_forstwirtsch.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_forstwirtsch.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_forstwirtsch.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_freiraumagrarber.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_freiraumagrarber.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_freiraumagrarber.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_freiraumagrarber.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_gib.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_gib.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_gib.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_gib.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_grundwgewschutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_grundwgewschutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_grundwgewschutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_grundwgewschutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_laermschutzzone.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_laermschutzzone.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_laermschutzzone.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_laermschutzzone.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_landschschutz.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_landschschutz.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_landschschutz.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_landschschutz.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_luftverk.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_luftverk.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_luftverk.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_luftverk.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_nats.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_nats.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_nats.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_nats.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_oberflngew.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_oberflngew.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_oberflngew.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_oberflngew.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_oberflnnahebs.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_oberflnnahebs.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_oberflnnahebs.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_oberflnnahebs.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_schienenverk.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_schienenverk.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_schienenverk.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_schienenverk.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstinfrastrukt.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstinfrastrukt.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstinfrastrukt.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstinfrastrukt.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstrsiedlber.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstrsiedlber.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstrsiedlber.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstrsiedlber.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstverk.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstverk.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstverk.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstverk.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstzweckbind.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstzweckbind.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstzweckbind.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_sonstzweckbind.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_strverk.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_strverk.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_strverk.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_strverk.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_uberschwber.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_uberschwber.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_uberschwber.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_uberschwber.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_wasserverk.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_wasserverk.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_wasserverk.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_wasserverk.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_zeitlin.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_zeitlin.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_zeitlin.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/rp/rpnw_zeitlin.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_baubeschraenkung.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_baubeschraenkung.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_baubeschraenkung.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_baubeschraenkung.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_bauverbotszone.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_bauverbotszone.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_bauverbotszone.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_bauverbotszone.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_bereich.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_bereich.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_bereich.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_bereich.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_bodenschutzrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_bodenschutzrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_bodenschutzrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_bodenschutzrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_denkmalschutzrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_denkmalschutzrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_denkmalschutzrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_denkmalschutzrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_forstrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_forstrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_forstrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_forstrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_gebiet.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_gebiet.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_gebiet.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_gebiet.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_gelaendemorphologie.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_gelaendemorphologie.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_gelaendemorphologie.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_gelaendemorphologie.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_gewaesser.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_gewaesser.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_gewaesser.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_gewaesser.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_grenze.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_grenze.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_grenze.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_grenze.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_luftverkehrsrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_luftverkehrsrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_luftverkehrsrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_luftverkehrsrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_plan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_plan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_plan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_plan.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schienenverkehrsrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schienenverkehrsrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schienenverkehrsrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schienenverkehrsrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schutzgebietnaturschutzrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schutzgebietnaturschutzrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schutzgebietnaturschutzrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schutzgebietnaturschutzrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schutzgebietsonstigesrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schutzgebietsonstigesrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schutzgebietsonstigesrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schutzgebietsonstigesrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schutzgebietwasserrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schutzgebietwasserrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schutzgebietwasserrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_schutzgebietwasserrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_sichtflaeche.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_sichtflaeche.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_sichtflaeche.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_sichtflaeche.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_sonstigesrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_sonstigesrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_sonstigesrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_sonstigesrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_strassenverkehr.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_strassenverkehr.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_strassenverkehr.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_strassenverkehr.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_strassenverkehrsrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_strassenverkehrsrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_strassenverkehrsrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_strassenverkehrsrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_textabschnittflaeche.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_textabschnittflaeche.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_textabschnittflaeche.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_textabschnittflaeche.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_wasserrecht.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_wasserrecht.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_wasserrecht.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_wasserrecht.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_wasserwirtschaft.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_wasserwirtschaft.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_wasserwirtschaft.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_wasserwirtschaft.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_fpo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_fpo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_fpo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_fpo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_lpo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_lpo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_lpo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_lpo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_lto.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_lto.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_lto.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_lto.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_ppo.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_ppo.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_ppo.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_ppo.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_pto.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_pto.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_pto.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/default/so/so_xp_pto.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/invisible.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/invisible.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/invisible.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/invisible.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/FreeSans.ttf b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/FreeSans.ttf similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/FreeSans.ttf rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/FreeSans.ttf diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/LROP/LROP_S_VR_GVZ.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/LROP/LROP_S_VR_GVZ.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/LROP/LROP_S_VR_GVZ.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/LROP/LROP_S_VR_GVZ.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_Erholung_VR.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_Erholung_VR.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_Erholung_VR.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_Erholung_VR.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_Erholung_vb.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_Erholung_vb.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_Erholung_vb.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_Erholung_vb.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_NeueVerkehrstechnik_VR.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_NeueVerkehrstechnik_VR.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_NeueVerkehrstechnik_VR.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_NeueVerkehrstechnik_VR.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Anschlussstelle_VR.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Anschlussstelle_VR.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Anschlussstelle_VR.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Anschlussstelle_VR.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Anschlussstelle_vb.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Anschlussstelle_vb.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Anschlussstelle_vb.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Anschlussstelle_vb.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Bahnhof_VR.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Bahnhof_VR.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Bahnhof_VR.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Bahnhof_VR.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Bahnhof_vb.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Bahnhof_vb.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Bahnhof_vb.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Bahnhof_vb.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_FernBahnhof_VR.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_FernBahnhof_VR.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_FernBahnhof_VR.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_FernBahnhof_VR.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Flugsport.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Flugsport.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Flugsport.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Flugsport.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZ_VR.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZ_VR.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZ_VR.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZ_VR.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZ_vb.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZ_vb.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZ_vb.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZ_vb.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZreg_VR.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZreg_VR.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZreg_VR.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZreg_VR.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZreg_vb.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZreg_vb.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZreg_vb.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_GVZreg_vb.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Golfsport.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Golfsport.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Golfsport.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Golfsport.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Motorsport.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Motorsport.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Motorsport.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Motorsport.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Reitsport.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Reitsport.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Reitsport.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Reitsport.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Schleuse_VR.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Schleuse_VR.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Schleuse_VR.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Schleuse_VR.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Wassersport.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Wassersport.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Wassersport.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_Wassersport.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_eltBetrieb_VR.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_eltBetrieb_VR.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_eltBetrieb_VR.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_eltBetrieb_VR.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_eltBetrieb_vb.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_eltBetrieb_vb.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_eltBetrieb_vb.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_eltBetrieb_vb.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_neueVerkehrstechnik.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_neueVerkehrstechnik.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_neueVerkehrstechnik.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/RROP/RROP_S_neueVerkehrstechnik.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/abgrabungbs_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/abgrabungbs_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/abgrabungbs_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/abgrabungbs_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/abstandsfl_rs.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/abstandsfl_rs.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/abstandsfl_rs.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/abstandsfl_rs.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/anpassungklimawandel-erhalt.png b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/anpassungklimawandel-erhalt.png similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/anpassungklimawandel-erhalt.png rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/anpassungklimawandel-erhalt.png diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhasons_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhasons_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhasons_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhasons_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhastr_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhastr_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhastr_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhastr_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhbesons_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhbesons_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhbesons_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhbesons_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhbestr_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhbestr_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhbestr_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/anpflanzbinderhbestr_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/bauverbotszone.png b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/bauverbotszone.png similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/bauverbotszone.png rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/bauverbotszone.png diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/berohneeinausflin_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/berohneeinausflin_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/berohneeinausflin_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/berohneeinausflin_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/d_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/d_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/d_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/d_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/denkmalscheinzelanl_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/denkmalscheinzelanl_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/denkmalscheinzelanl_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/denkmalscheinzelanl_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/denkmalschens_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/denkmalschens_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/denkmalschens_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/denkmalschens_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/einfberlin_as.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/einfberlin_as.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/einfberlin_as.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/einfberlin_as.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/einfberlin_es.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/einfberlin_es.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/einfberlin_es.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/einfberlin_es.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/erhaltungsber_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/erhaltungsber_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/erhaltungsber_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/erhaltungsber_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/firstlin_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/firstlin_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/firstlin_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/firstlin_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gelaendemorphologie-rinne.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gelaendemorphologie-rinne.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gelaendemorphologie-rinne.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gelaendemorphologie-rinne.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gelaendemorphologie-terrassenkanten.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gelaendemorphologie-terrassenkanten.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gelaendemorphologie-terrassenkanten.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gelaendemorphologie-terrassenkanten.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflfeu_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflfeu_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflfeu_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflfeu_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflges_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflges_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflges_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflges_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflkirch_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflkirch_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflkirch_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflkirch_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflkult_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflkult_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflkult_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflkult_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsfloeff_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsfloeff_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsfloeff_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsfloeff_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflschule_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflschule_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflschule_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflschule_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflschutzb_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflschutzb_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflschutzb_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflschutzb_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflsoz_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflsoz_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflsoz_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflsoz_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflspo_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflspo_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflspo_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gembedarfsflspo_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenfl_bg.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenfl_bg.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenfl_bg.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenfl_bg.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflbadpl_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflbadpl_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflbadpl_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflbadpl_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflboeschung_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflboeschung_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflboeschung_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflboeschung_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflbolzpl_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflbolzpl_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflbolzpl_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflbolzpl_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenfldakleingar_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenfldakleingar_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenfldakleingar_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenfldakleingar_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflerholgaerten_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflerholgaerten_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflerholgaerten_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflerholgaerten_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflfreizherh_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflfreizherh_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflfreizherh_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflfreizherh_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflfriedh_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflfriedh_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflfriedh_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflfriedh_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflgolfpl_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflgolfpl_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflgolfpl_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflgolfpl_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflkleintier_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflkleintier_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflkleintier_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflkleintier_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflpark_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflpark_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflpark_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflpark_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflskate_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflskate_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflskate_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflskate_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflsons_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflsons_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflsons_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflsons_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflspezgru_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflspezgru_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflspezgru_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflspezgru_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflspielpl_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflspielpl_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflspielpl_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflspielpl_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflsportpl_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflsportpl_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflsportpl_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflsportpl_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflstrabeglgruen_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflstrabeglgruen_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflstrabeglgruen_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflstrabeglgruen_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflzeltpl_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflzeltpl_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflzeltpl_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/gruenflzeltpl_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/hoehenpt_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/hoehenpt_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/hoehenpt_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/hoehenpt_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/laermschutzbereich.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/laermschutzbereich.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/laermschutzbereich.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/laermschutzbereich.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/naturlandschaft-freiraum.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/naturlandschaft-freiraum.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/naturlandschaft-freiraum.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/naturlandschaft-freiraum.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/naturschutzrecht.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/naturschutzrecht.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/naturschutzrecht.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/naturschutzrecht.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/nebenanlausschl_neu.png b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/nebenanlausschl_neu.png similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/nebenanlausschl_neu.png rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/nebenanlausschl_neu.png diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/nichtueberbaubaregrundstuecksfl.png b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/nichtueberbaubaregrundstuecksfl.png similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/nichtueberbaubaregrundstuecksfl.png rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/nichtueberbaubaregrundstuecksfl.png diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebbiosph_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebbiosph_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebbiosph_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebbiosph_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebeurvog_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebeurvog_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebeurvog_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebeurvog_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebgembed_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebgembed_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebgembed_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebgembed_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebgeschbio_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebgeschbio_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebgeschbio_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebgeschbio_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebgeschla_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebgeschla_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebgeschla_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebgeschla_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgeblandsch_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgeblandsch_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgeblandsch_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgeblandsch_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnatpark_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnatpark_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnatpark_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnatpark_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnatur_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnatur_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnatur_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnatur_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnaturdenk_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnaturdenk_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnaturdenk_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnaturdenk_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnaturpark_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnaturpark_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnaturpark_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzgebnaturpark_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzpflentwfl_rs.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzpflentwfl_rs.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzpflentwfl_rs.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/schutzpflentwfl_rs.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/sichtflaeche.png b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/sichtflaeche.png similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/sichtflaeche.png rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/sichtflaeche.png diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_arkade.png b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_arkade.png similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_arkade.png rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_arkade.png diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_auskragung.png b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_auskragung.png similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_auskragung.png rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_auskragung.png diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_bruecke.png b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_bruecke.png similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_bruecke.png rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_bruecke.png diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_rampe.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_rampe.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_rampe.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/speziellebauweise_rampe.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanfl_rs.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanfl_rs.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanfl_rs.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanfl_rs.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanlfl_bg.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanlfl_bg.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanlfl_bg.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanlfl_bg.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanlflspi_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanlflspi_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanlflspi_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanlflspi_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanlflspo_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanlflspo_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanlflspo_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/spispoanlflspo_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/strkoerperauf_rs.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/strkoerperauf_rs.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/strkoerperauf_rs.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/strkoerperauf_rs.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/strkoerperstuetz_rs.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/strkoerperstuetz_rs.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/strkoerperstuetz_rs.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/strkoerperstuetz_rs.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/todo.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/todo.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/todo.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/todo.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgabfall_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgabfall_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgabfall_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgabfall_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgablag_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgablag_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgablag_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgablag_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgabwa_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgabwa_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgabwa_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgabwa_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgelektr_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgelektr_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgelektr_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgelektr_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorggas_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorggas_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorggas_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorggas_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgwasser_sym.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgwasser_sym.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgwasser_sym.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verentsorgwasser_sym.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verksflbeszwb_neu.png b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verksflbeszwb_neu.png similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/verksflbeszwb_neu.png rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/verksflbeszwb_neu.png diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/wegerecht.svg b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/wegerecht.svg similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/symbols/wegerecht.svg rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/symbols/wegerecht.svg diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/transparent/bp/bp_plan_trans.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/transparent/bp/bp_plan_trans.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/transparent/bp/bp_plan_trans.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/transparent/bp/bp_plan_trans.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/transparent/fp/fp_plan_trans.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/transparent/fp/fp_plan_trans.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/transparent/fp/fp_plan_trans.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/transparent/fp/fp_plan_trans.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/transparent/lp/lp_plan_trans.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/transparent/lp/lp_plan_trans.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/transparent/lp/lp_plan_trans.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/transparent/lp/lp_plan_trans.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/transparent/rp/rp_plan_trans.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/transparent/rp/rp_plan_trans.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/transparent/rp/rp_plan_trans.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/transparent/rp/rp_plan_trans.xml diff --git a/xplan-workspaces/src/main/workspace/styles/xplansyn/transparent/transparent.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/transparent/transparent.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/styles/xplansyn/transparent/transparent.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/styles/xplansyn/transparent/transparent.xml diff --git a/xplan-workspaces/src/main/workspace/themes/bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/bplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/bplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/bplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/bplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/bplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/themes/bplanarchiveraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/bplanarchiveraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/bplanarchiveraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/bplanarchiveraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/bplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/bplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/bplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/bplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/themes/bplanpreraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/bplanpreraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/bplanpreraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/bplanpreraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/bplanraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/bplanraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/bplanraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/bplanraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/fplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/fplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/fplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/fplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/fplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/themes/fplanarchiveraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/fplanarchiveraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/fplanarchiveraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/fplanarchiveraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/fplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/fplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/fplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/fplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/themes/fplanpreraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/fplanpreraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/fplanpreraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/fplanpreraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/fplanraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/fplanraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/fplanraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/fplanraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/inspireplu.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/inspireplu.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/inspireplu.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/inspireplu.xml diff --git a/xplan-workspaces/src/main/workspace/themes/lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/lplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/lplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/lplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/lplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/lplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/themes/lplanarchiveraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/lplanarchiveraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/lplanarchiveraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/lplanarchiveraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/lplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/lplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/lplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/lplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/themes/lplanpreraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/lplanpreraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/lplanpreraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/lplanpreraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/lplanraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/lplanraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/lplanraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/lplanraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/bplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/bplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/bplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/bplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/bplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/bplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/bplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/bplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/bplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/fplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/fplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/fplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/fplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/fplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/fplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/fplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/fplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/fplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/lplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/lplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/lplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/lplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/lplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/lplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/lplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/lplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/lplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/rplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/rplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/rplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/rplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/rplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/rplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/rplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/rplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/rplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/soplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/soplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/soplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/soplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/soplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/themes/planart-wms/soplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/soplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/planart-wms/soplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/planart-wms/soplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/themes/rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/rplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/rplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/rplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/rplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/rplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/themes/rplanarchiveraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/rplanarchiveraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/rplanarchiveraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/rplanarchiveraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/rplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/rplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/rplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/rplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/themes/rplanpreraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/rplanpreraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/rplanpreraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/rplanpreraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/rplanraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/rplanraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/rplanraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/rplanraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/soplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/soplanarchive.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/soplanarchive.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/soplanarchive.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/soplanarchive.xml diff --git a/xplan-workspaces/src/main/workspace/themes/soplanarchiveraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/soplanarchiveraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/soplanarchiveraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/soplanarchiveraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/soplanpre.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/soplanpre.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/soplanpre.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/soplanpre.xml diff --git a/xplan-workspaces/src/main/workspace/themes/soplanpreraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/soplanpreraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/soplanpreraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/soplanpreraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/soplanraster.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/soplanraster.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/soplanraster.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/soplanraster.xml diff --git a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/bplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/validator-wms/memory/bplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/validator-wms/memory/bplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/validator-wms/memory/bplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/fplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/validator-wms/memory/fplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/validator-wms/memory/fplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/validator-wms/memory/fplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/lplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/validator-wms/memory/lplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/validator-wms/memory/lplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/validator-wms/memory/lplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/rplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/validator-wms/memory/rplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/validator-wms/memory/rplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/validator-wms/memory/rplan.xml diff --git a/xplan-workspaces/src/main/workspace/themes/validator-wms/memory/soplan.xml b/xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/validator-wms/memory/soplan.xml similarity index 100% rename from xplan-workspaces/src/main/workspace/themes/validator-wms/memory/soplan.xml rename to xplan-webservices/xplan-webservices-workspaces/src/main/workspace/themes/validator-wms/memory/soplan.xml