diff --git a/pom.xml b/pom.xml
index 72785644325396e1785c1ba10cc671e8b0a84909..dcf704268f73bbd2df42c8a01f023dddab56e902 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,8 +66,6 @@
<module>xplan-documentation</module>
<module>xplan-dokumente</module>
<module>xplan-manager</module>
- <module>xplan-mapproxy</module>
- <module>xplan-mapserver</module>
<module>xplan-resources</module>
<module>xplan-root</module>
<module>xplan-security</module>
diff --git a/xplan-cli/xplan-cli-core/pom.xml b/xplan-cli/xplan-cli-core/pom.xml
index 165a37dff65bcd0513e3a7af0b4e72d7d65fcec7..fa5b04496623320d5f7d4a644697ff24f2310dc8 100644
--- a/xplan-cli/xplan-cli-core/pom.xml
+++ b/xplan-cli/xplan-cli-core/pom.xml
@@ -6,7 +6,7 @@
<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-validator/pom.xml b/xplan-validator/pom.xml
index 5bf113021b03e06017f05fd8cad390abde706e10..0f503329036f0945ea26a02deec67a9450873ed6 100644
--- a/xplan-validator/pom.xml
+++ b/xplan-validator/pom.xml
@@ -15,7 +15,6 @@
<module>xplan-validator-api</module>
<module>xplan-validator-config</module>
<module>xplan-validator-web</module>
- <module>xplan-validator-wms</module>
</modules>
</project>
\ No newline at end of file
diff --git a/xplan-webservices/pom.xml b/xplan-webservices/pom.xml
index aa28748f02ffd551c6c6bbaa7f3b1ce11d4933a0..596f52efe41b8f7267fbf3f27e209a35174d4382 100644
--- a/xplan-webservices/pom.xml
+++ b/xplan-webservices/pom.xml
@@ -13,20 +13,13 @@
<modules>
<module>xplan-webservices-core</module>
- <module>xplan-inspireplu</module>
- <module>xplansyn-wfs</module>
- <module>xplan-wfs</module>
- <module>xplan-wms</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>
</modules>
- <profiles>
- <profile>
- <id>docker</id>
- <modules>
- <module>xplan-services-docker</module>
- </modules>
- </profile>
- </profiles>
<build>
<plugins>
<plugin>
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 97%
rename from xplan-webservices/xplan-inspireplu/pom.xml
rename to xplan-webservices/xplan-webservices-inspireplu/pom.xml
index 27595074dfaa4102e593b1c30281e0af12160b42..6e173de518b141331664c9696bfdcd3efee18c27 100644
--- a/xplan-webservices/xplan-inspireplu/pom.xml
+++ b/xplan-webservices/xplan-webservices-inspireplu/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-inspireplu</artifactId>
+ <artifactId>xplan-webservices-inspireplu</artifactId>
<packaging>war</packaging>
<description>deegree INSPIRE PLU webservices</description>
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-validator/xplan-validator-wms/src/main/webapp/version.txt b/xplan-webservices/xplan-webservices-inspireplu/src/main/webapp/version.txt
similarity index 100%
rename from xplan-validator/xplan-validator-wms/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-mapproxy/pom.xml b/xplan-webservices/xplan-webservices-mapproxy/pom.xml
similarity index 84%
rename from xplan-mapproxy/pom.xml
rename to xplan-webservices/xplan-webservices-mapproxy/pom.xml
index a3dd2722f205c86734f526106e05dc9ce17bca29..f154e2a58c1a1ff4fd61eea57db578a88c6577cf 100644
--- a/xplan-mapproxy/pom.xml
+++ b/xplan-webservices/xplan-webservices-mapproxy/pom.xml
@@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>xplan-mapproxy</artifactId>
+ <artifactId>xplan-webservices-mapproxy</artifactId>
<packaging>pom</packaging>
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
- <artifactId>xplanbox</artifactId>
+ <artifactId>xplan-webservices</artifactId>
<version>7.2-SNAPSHOT</version>
</parent>
diff --git a/xplan-mapproxy/xplan-mapproxy-config/pom.xml b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-config/pom.xml
similarity index 95%
rename from xplan-mapproxy/xplan-mapproxy-config/pom.xml
rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-config/pom.xml
index a953d451b37918ddef198b8fda9a26b2195681e7..40d9ceacf2d43ce0e24c208ba49ad8522823a090 100644
--- a/xplan-mapproxy/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-mapproxy</artifactId>
+ <artifactId>xplan-webservices-mapproxy</artifactId>
<version>7.2-SNAPSHOT</version>
</parent>
diff --git a/xplan-mapproxy/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-mapproxy/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-mapproxy/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-mapproxy/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-mapproxy/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-mapproxy/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-mapproxy/xplan-mapproxy-docker/Dockerfile b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/Dockerfile
similarity index 100%
rename from xplan-mapproxy/xplan-mapproxy-docker/Dockerfile
rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/Dockerfile
diff --git a/xplan-mapproxy/xplan-mapproxy-docker/app.py b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/app.py
similarity index 100%
rename from xplan-mapproxy/xplan-mapproxy-docker/app.py
rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/app.py
diff --git a/xplan-mapproxy/xplan-mapproxy-docker/docker-entrypoint.sh b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/docker-entrypoint.sh
similarity index 100%
rename from xplan-mapproxy/xplan-mapproxy-docker/docker-entrypoint.sh
rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/docker-entrypoint.sh
diff --git a/xplan-mapproxy/xplan-mapproxy-docker/log.ini b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/log.ini
similarity index 100%
rename from xplan-mapproxy/xplan-mapproxy-docker/log.ini
rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/log.ini
diff --git a/xplan-mapproxy/xplan-mapproxy-docker/pom.xml b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/pom.xml
similarity index 96%
rename from xplan-mapproxy/xplan-mapproxy-docker/pom.xml
rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/pom.xml
index b9c914abd6f2744af4ed6c5b7cb3a6b29ba622ea..768dc0b813e6352845ebe793bab5af18303495c7 100644
--- a/xplan-mapproxy/xplan-mapproxy-docker/pom.xml
+++ b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
- <artifactId>xplan-mapproxy</artifactId>
+ <artifactId>xplan-webservices-mapproxy</artifactId>
<version>7.2-SNAPSHOT</version>
</parent>
diff --git a/xplan-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml
similarity index 100%
rename from xplan-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml
rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml
diff --git a/xplan-mapproxy/xplan-mapproxy-docker/uwsgi.ini b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/uwsgi.ini
similarity index 100%
rename from xplan-mapproxy/xplan-mapproxy-docker/uwsgi.ini
rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/uwsgi.ini
diff --git a/xplan-mapserver/pom.xml b/xplan-webservices/xplan-webservices-mapserver/pom.xml
similarity index 84%
rename from xplan-mapserver/pom.xml
rename to xplan-webservices/xplan-webservices-mapserver/pom.xml
index b74046aaa9bc2007fdd6ad24db3cdde298f63525..8e626481068fa4c8626628ba76e6cb922ea8423f 100644
--- a/xplan-mapserver/pom.xml
+++ b/xplan-webservices/xplan-webservices-mapserver/pom.xml
@@ -2,12 +2,12 @@
<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-mapserver</artifactId>
+ <artifactId>xplan-webservices-mapserver</artifactId>
<packaging>pom</packaging>
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
- <artifactId>xplanbox</artifactId>
+ <artifactId>xplan-webservices</artifactId>
<version>7.2-SNAPSHOT</version>
</parent>
diff --git a/xplan-mapserver/xplan-mapserver-config/pom.xml b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-config/pom.xml
similarity index 95%
rename from xplan-mapserver/xplan-mapserver-config/pom.xml
rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-config/pom.xml
index b97efc9483868aac4c1691cf88a13ebac348eedd..cc4883209f45f273875d3747559cd4a78b290687 100644
--- a/xplan-mapserver/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-mapserver</artifactId>
+ <artifactId>xplan-webservices-mapserver</artifactId>
<version>7.2-SNAPSHOT</version>
</parent>
diff --git a/xplan-mapserver/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-mapserver/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-mapserver/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-mapserver/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-mapserver/xplan-mapserver-docker/Dockerfile b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile
similarity index 100%
rename from xplan-mapserver/xplan-mapserver-docker/Dockerfile
rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile
diff --git a/xplan-mapserver/xplan-mapserver-docker/pom.xml b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml
similarity index 96%
rename from xplan-mapserver/xplan-mapserver-docker/pom.xml
rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml
index 75cbd0aa38346bc98ee7f0923c61516cbd2504a3..dfd23baccf71156b67f3b929dd67a8ae33fa6f69 100644
--- a/xplan-mapserver/xplan-mapserver-docker/pom.xml
+++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
- <artifactId>xplan-mapserver</artifactId>
+ <artifactId>xplan-webservices-mapserver</artifactId>
<version>7.2-SNAPSHOT</version>
</parent>
diff --git a/xplan-mapserver/xplan-mapserver-docker/src/assembly/xplan-docker-mapserver.xml b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-docker-mapserver.xml
similarity index 100%
rename from xplan-mapserver/xplan-mapserver-docker/src/assembly/xplan-docker-mapserver.xml
rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-docker-mapserver.xml
diff --git a/xplan-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh
similarity index 100%
rename from xplan-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh
rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh
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 98%
rename from xplan-webservices/xplan-services-docker/pom.xml
rename to xplan-webservices/xplan-webservices-services/xplan-services-docker/pom.xml
index 262e01ee3a67ee15fc02fb9e0c2a051cfb414f16..ee525016d536e5783baf68dbcb2bbfa96850ae3b 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>
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 91%
rename from xplan-webservices/xplansyn-wfs/pom.xml
rename to xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/pom.xml
index 70b006bc83e403b59461b152c1566c073c768a94..97891fba0f0f5c619e4ec8738b33d37d4daa77c7 100644
--- a/xplan-webservices/xplansyn-wfs/pom.xml
+++ b/xplan-webservices/xplan-webservices-services/xplan-services-wfs-syn/pom.xml
@@ -1,12 +1,12 @@
<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>
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-inspireplu/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-inspireplu/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 96%
rename from xplan-webservices/xplan-wfs/pom.xml
rename to xplan-webservices/xplan-webservices-services/xplan-services-wfs/pom.xml
index db6ae1225e973d45506fe4dd48f3939b18c1c604..31c013b0aec4858d1d22f90b88eb59067076521a 100644
--- a/xplan-webservices/xplan-wfs/pom.xml
+++ b/xplan-webservices/xplan-webservices-services/xplan-services-wfs/pom.xml
@@ -1,6 +1,6 @@
<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>
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 97%
rename from xplan-webservices/xplan-wms/pom.xml
rename to xplan-webservices/xplan-webservices-services/xplan-services-wms/pom.xml
index b4952278d68c1dbed31514d30f99d03a87b42d7b..cb81dadf12b4a4415f428b2934c77a22bd8d6a50 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>
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 100%
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
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-validator/xplan-validator-wms/Dockerfile b/xplan-webservices/xplan-webservices-validator-wms/Dockerfile
similarity index 90%
rename from xplan-validator/xplan-validator-wms/Dockerfile
rename to xplan-webservices/xplan-webservices-validator-wms/Dockerfile
index d9e5b9efd95ae593674bcef8c093959951a66cf0..e8a0abb1d167dfd4083749805e313dbdff05f336 100644
--- a/xplan-validator/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-validator/xplan-validator-wms/pom.xml b/xplan-webservices/xplan-webservices-validator-wms/pom.xml
similarity index 97%
rename from xplan-validator/xplan-validator-wms/pom.xml
rename to xplan-webservices/xplan-webservices-validator-wms/pom.xml
index ffdd59791cabcf40b02ce1860cd5690d9642a69c..f560c240c8ed2bcc37ab4046e8140257c447f18d 100644
--- a/xplan-validator/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>
diff --git a/xplan-validator/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-validator/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-validator/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-validator/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-validator/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-validator/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-validator/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-validator/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-validator/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-validator/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