run on current main branch

deegree · May 13, 2022 · e24b83c · e24b83c
1 parent cc4bbbb
commit e24b83c
Show file tree

Hide file tree

Showing 189 changed files with 75 additions and 75 deletions.
diff --git a/...asource/src/main/java/org/deegree/db/datasource/DataSourceConnectionProviderProvider.java b/...asource/src/main/java/org/deegree/db/datasource/DataSourceConnectionProviderProvider.java
@@ -59,7 +59,7 @@ public class DataSourceConnectionProviderProvider extends ConnectionProviderProv
 
     static final String CONFIG_NAMESPACE = "http://www.deegree.org/connectionprovider/datasource";
 
-    static final URL SCHEMA_URL = DataSourceConnectionProviderProvider.class.getResource( "/META-INF/schemas/connectionprovider/datasource/3.4.0/datasource.xsd" );
+    static final URL SCHEMA_URL = DataSourceConnectionProviderProvider.class.getResource( "/META-INF/schemas/connectionprovider/datasource/datasource.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...nprovider/datasource/3.4.0/datasource.xsd → ...nectionprovider/datasource/datasource.xsd b/...nprovider/datasource/3.4.0/datasource.xsd → ...nectionprovider/datasource/datasource.xsd
diff --git a/...r/datasource/3.4.0/example_dbcp_mssql.xml → ...rovider/datasource/example_dbcp_mssql.xml b/...r/datasource/3.4.0/example_dbcp_mssql.xml → ...rovider/datasource/example_dbcp_mssql.xml
diff --git a/.../datasource/3.4.0/example_dbcp_oracle.xml → ...ovider/datasource/example_dbcp_oracle.xml b/.../datasource/3.4.0/example_dbcp_oracle.xml → ...ovider/datasource/example_dbcp_oracle.xml
diff --git a/...atasource/3.4.0/example_dbcp_postgres.xml → ...ider/datasource/example_dbcp_postgres.xml b/...atasource/3.4.0/example_dbcp_postgres.xml → ...ider/datasource/example_dbcp_postgres.xml
diff --git a/...rovider/datasource/3.4.0/example_jndi.xml → ...ctionprovider/datasource/example_jndi.xml b/...rovider/datasource/3.4.0/example_jndi.xml → ...ctionprovider/datasource/example_jndi.xml
diff --git a/...provider/datasource/3.4.0/example_ucp.xml → ...ectionprovider/datasource/example_ucp.xml b/...provider/datasource/3.4.0/example_ucp.xml → ...ectionprovider/datasource/example_ucp.xml
diff --git a/...ava/org/deegree/rendering/r3d/multiresolution/persistence/BatchedMTFileStoreProvider.java b/...ava/org/deegree/rendering/r3d/multiresolution/persistence/BatchedMTFileStoreProvider.java
@@ -53,7 +53,7 @@ public class BatchedMTFileStoreProvider extends BatchedMTStoreProvider {
 
     private static final String CONFIG_NS = "http://www.deegree.org/datasource/3d/batchedmt/file";
 
-    private static final URL CONFIG_SCHEMA = BatchedMTFileStoreProvider.class.getResource( "/META-INF/schemas/datasource/3d/batchedmt/3.4.0/file.xsd" );
+    private static final URL CONFIG_SCHEMA = BatchedMTFileStoreProvider.class.getResource( "/META-INF/schemas/datasource/3d/batchedmt/file.xsd" );
 
     public String getNamespace() {
         return CONFIG_NS;

diff --git a/...datasource/3d/batchedmt/3.4.0/example.xml → ...hemas/datasource/3d/batchedmt/example.xml b/...datasource/3d/batchedmt/3.4.0/example.xml → ...hemas/datasource/3d/batchedmt/example.xml
diff --git a/...as/datasource/3d/batchedmt/3.4.0/file.xsd → .../schemas/datasource/3d/batchedmt/file.xsd b/...as/datasource/3d/batchedmt/3.4.0/file.xsd → .../schemas/datasource/3d/batchedmt/file.xsd
diff --git a/...s/datasource/3d/renderable/3.4.0/file.xsd → ...schemas/datasource/3d/renderable/file.xsd b/...s/datasource/3d/renderable/3.4.0/file.xsd → ...schemas/datasource/3d/renderable/file.xsd
diff --git a/...urce/3d/renderable/3.4.0/file_example.xml → ...datasource/3d/renderable/file_example.xml b/...urce/3d/renderable/3.4.0/file_example.xml → ...datasource/3d/renderable/file_example.xml
diff --git a/...as/datasource/3d/renderable/3.4.0/sql.xsd → .../schemas/datasource/3d/renderable/sql.xsd b/...as/datasource/3d/renderable/3.4.0/sql.xsd → .../schemas/datasource/3d/renderable/sql.xsd
diff --git a/...ource/3d/renderable/3.4.0/sql_example.xml → .../datasource/3d/renderable/sql_example.xml b/...ource/3d/renderable/3.4.0/sql_example.xml → .../datasource/3d/renderable/sql_example.xml
diff --git a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/proxy/ProxySettings.java b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/proxy/ProxySettings.java
@@ -73,7 +73,7 @@ public final class ProxySettings implements Initializable {
 
     private static final String CONFIG_JAXB_PACKAGE = "org.deegree.commons.proxy.jaxb";
 
-    private static final URL CONFIG_SCHEMA = ProxySettings.class.getResource( "/META-INF/schemas/proxy/3.4.0/proxy.xsd" );
+    private static final URL CONFIG_SCHEMA = ProxySettings.class.getResource( "/META-INF/schemas/proxy/proxy.xsd" );
 
     private static final String PROXY_HOST = "proxyHost";
 

diff --git a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/xml/jaxb/JAXBUtils.java b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/xml/jaxb/JAXBUtils.java
@@ -146,9 +146,9 @@ private static Schema getSchemaForUrl( URL schemaFile ) {
             try {
                 StreamSource origSchema = new StreamSource( new DURL( schemaFile.toExternalForm() ).openStream(),
                                                             schemaFile.toExternalForm() );
-                URL descUrl = JAXBUtils.class.getResource( "/META-INF/schemas/commons/description/3.4.0/description.xsd" );
-                URL spatUrl = JAXBUtils.class.getResource( "/META-INF/schemas/commons/spatialmetadata/3.4.0/spatialmetadata.xsd" );
-                URL layUrl = JAXBUtils.class.getResource( "/META-INF/schemas/layers/base/3.4.0/base.xsd" );
+                URL descUrl = JAXBUtils.class.getResource( "/META-INF/schemas/commons/description/description.xsd" );
+                URL spatUrl = JAXBUtils.class.getResource( "/META-INF/schemas/commons/spatialmetadata/spatialmetadata.xsd" );
+                URL layUrl = JAXBUtils.class.getResource( "/META-INF/schemas/layers/base/base.xsd" );
                 StreamSource desc = new StreamSource( new DURL( descUrl.toExternalForm() ).openStream(),
                                                       descUrl.toExternalForm() );
                 List<Source> list = new ArrayList<Source>();

diff --git a/...commons/description/3.4.0/description.xsd → ...hemas/commons/description/description.xsd b/...commons/description/3.4.0/description.xsd → ...hemas/commons/description/description.xsd
diff --git a/.../META-INF/schemas/proxy/3.4.0/example.xml → ...ources/META-INF/schemas/proxy/example.xml b/.../META-INF/schemas/proxy/3.4.0/example.xml → ...ources/META-INF/schemas/proxy/example.xml
diff --git a/...es/META-INF/schemas/proxy/3.4.0/proxy.xsd → ...esources/META-INF/schemas/proxy/proxy.xsd b/...es/META-INF/schemas/proxy/3.4.0/proxy.xsd → ...esources/META-INF/schemas/proxy/proxy.xsd
diff --git a/...core-coverage/src/main/java/org/deegree/coverage/persistence/DefaultCoverageProvider.java b/...core-coverage/src/main/java/org/deegree/coverage/persistence/DefaultCoverageProvider.java
@@ -58,7 +58,7 @@ Occam Labs UG (haftungsbeschränkt)
  */
 public class DefaultCoverageProvider extends CoverageProvider {
 
-    private static final URL CONFIG_SCHEMA = DefaultCoverageProvider.class.getResource( "/META-INF/schemas/datasource/coverage/raster/3.4.0/raster.xsd" );
+    private static final URL CONFIG_SCHEMA = DefaultCoverageProvider.class.getResource( "/META-INF/schemas/datasource/coverage/raster/raster.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...erage/src/main/java/org/deegree/coverage/persistence/pyramid/PyramidCoverageProvider.java b/...erage/src/main/java/org/deegree/coverage/persistence/pyramid/PyramidCoverageProvider.java
@@ -59,7 +59,7 @@ Occam Labs UG (haftungsbeschränkt)
  */
 public class PyramidCoverageProvider extends CoverageProvider {
 
-    private static final URL CONFIG_SCHEMA = PyramidCoverageProvider.class.getResource( "/META-INF/schemas/datasource/coverage/raster/3.4.0/pyramid.xsd" );
+    private static final URL CONFIG_SCHEMA = PyramidCoverageProvider.class.getResource( "/META-INF/schemas/datasource/coverage/raster/pyramid.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...ource/coverage/raster/3.4.0/directory.xml → .../datasource/coverage/raster/directory.xml b/...ource/coverage/raster/3.4.0/directory.xml → .../datasource/coverage/raster/directory.xml
diff --git a/...asource/coverage/raster/3.4.0/example.xml → ...as/datasource/coverage/raster/example.xml b/...asource/coverage/raster/3.4.0/example.xml → ...as/datasource/coverage/raster/example.xml
diff --git a/...asource/coverage/raster/3.4.0/pyramid.xsd → ...as/datasource/coverage/raster/pyramid.xsd b/...asource/coverage/raster/3.4.0/pyramid.xsd → ...as/datasource/coverage/raster/pyramid.xsd
diff --git a/...tasource/coverage/raster/3.4.0/raster.xsd → ...mas/datasource/coverage/raster/raster.xsd b/...tasource/coverage/raster/3.4.0/raster.xsd → ...mas/datasource/coverage/raster/raster.xsd
diff --git a/...tasource/coverage/raster/3.4.0/single.xml → ...mas/datasource/coverage/raster/single.xml b/...tasource/coverage/raster/3.4.0/single.xml → ...mas/datasource/coverage/raster/single.xml
diff --git a/...-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/DeegreeCRSStoreProvider.java b/...-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/DeegreeCRSStoreProvider.java
@@ -71,7 +71,7 @@ public class DeegreeCRSStoreProvider implements CRSStoreProvider {
 
     private static final String CONFIG_JAXB_PACKAGE = "org.deegree.cs.persistence.deegree.d3.jaxb";
 
-    private static final URL CONFIG_SCHEMA = DeegreeCRSStoreProvider.class.getResource( "/META-INF/schemas/crs/stores/deegree/3.4.0/deegree.xsd" );
+    private static final URL CONFIG_SCHEMA = DeegreeCRSStoreProvider.class.getResource( "/META-INF/schemas/crs/stores/deegree/deegree.xsd" );
 
     private static final String CONFIG_TEMPLATE = "/META-INF/schemas/crs/stores/deegree/3.4.0/example.xml";
 

diff --git a/...ore/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLCRSStoreProvider.java b/...ore/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLCRSStoreProvider.java
@@ -74,7 +74,7 @@ public class GMLCRSStoreProvider implements CRSStoreProvider {
 
     private static final String CONFIG_JAXB_PACKAGE = "org.deegree.cs.persistence.gml.jaxb";
 
-    private static final URL CONFIG_SCHEMA = GMLCRSStoreProvider.class.getResource( "/META-INF/schemas/crs/stores/gml/3.4.0/gml.xsd" );
+    private static final URL CONFIG_SCHEMA = GMLCRSStoreProvider.class.getResource( "/META-INF/schemas/crs/stores/gml/gml.xsd" );
 
     @Override
     public String getConfigNamespace() {

diff --git a/...deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/PROJ4CRSStoreProvider.java b/...deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/PROJ4CRSStoreProvider.java
@@ -69,7 +69,7 @@ public class PROJ4CRSStoreProvider implements CRSStoreProvider {
 
     private static final String CONFIG_JAXB_PACKAGE = "org.deegree.cs.persistence.proj4.jaxb";
 
-    private static final URL CONFIG_SCHEMA = PROJ4CRSStoreProvider.class.getResource( "/META-INF/schemas/crs/stores/proj4/3.4.0/proj4.xsd" );
+    private static final URL CONFIG_SCHEMA = PROJ4CRSStoreProvider.class.getResource( "/META-INF/schemas/crs/stores/proj4/proj4.xsd" );
 
     @Override
     public String getConfigNamespace() {

diff --git a/...A-INF/schemas/crs/3.4.0/crsdefinition.xsd → ...es/META-INF/schemas/crs/crsdefinition.xsd b/...A-INF/schemas/crs/3.4.0/crsdefinition.xsd → ...es/META-INF/schemas/crs/crsdefinition.xsd
diff --git a/...emas/crs/stores/deegree/3.4.0/deegree.xsd → ...NF/schemas/crs/stores/deegree/deegree.xsd b/...emas/crs/stores/deegree/3.4.0/deegree.xsd → ...NF/schemas/crs/stores/deegree/deegree.xsd
@@ -5,7 +5,7 @@
 	elementFormDefault="qualified" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
 	jaxb:version="2.1">
 	<import namespace="http://www.deegree.org/crs/store"
-		schemaLocation="../../store.xsd" />
+		schemaLocation="" />
 	<annotation>
 		<appinfo>
 			<jaxb:schemaBindings>

diff --git a/...emas/crs/stores/deegree/3.4.0/example.xml → ...NF/schemas/crs/stores/deegree/example.xml b/...emas/crs/stores/deegree/3.4.0/example.xml → ...NF/schemas/crs/stores/deegree/example.xml
diff --git a/...as/crs/stores/deegree2/3.4.0/deegree2.xsd → .../schemas/crs/stores/deegree2/deegree2.xsd b/...as/crs/stores/deegree2/3.4.0/deegree2.xsd → .../schemas/crs/stores/deegree2/deegree2.xsd
@@ -5,7 +5,7 @@
 	elementFormDefault="qualified" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
 	jaxb:version="2.1">
 	<import namespace="http://www.deegree.org/crs/store"
-		schemaLocation="../../store.xsd" />
+		schemaLocation="" />
 	<annotation>
 		<appinfo>
 			<jaxb:schemaBindings>

diff --git a/...mas/crs/stores/deegree2/3.4.0/example.xml → ...F/schemas/crs/stores/deegree2/example.xml b/...mas/crs/stores/deegree2/3.4.0/example.xml → ...F/schemas/crs/stores/deegree2/example.xml
diff --git a/.../schemas/crs/stores/gml/3.4.0/example.xml → ...TA-INF/schemas/crs/stores/gml/example.xml b/.../schemas/crs/stores/gml/3.4.0/example.xml → ...TA-INF/schemas/crs/stores/gml/example.xml
diff --git a/...-INF/schemas/crs/stores/gml/3.4.0/gml.xsd → ...s/META-INF/schemas/crs/stores/gml/gml.xsd b/...-INF/schemas/crs/stores/gml/3.4.0/gml.xsd → ...s/META-INF/schemas/crs/stores/gml/gml.xsd
@@ -5,7 +5,7 @@
 	elementFormDefault="qualified" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
 	jaxb:version="2.1">
 	<import namespace="http://www.deegree.org/crs/store"
-		schemaLocation="../../store.xsd" />
+		schemaLocation="" />
 	<annotation>
 		<appinfo>
 			<jaxb:schemaBindings>

diff --git a/...chemas/crs/stores/proj4/3.4.0/example.xml → ...-INF/schemas/crs/stores/proj4/example.xml b/...chemas/crs/stores/proj4/3.4.0/example.xml → ...-INF/schemas/crs/stores/proj4/example.xml
diff --git a/.../schemas/crs/stores/proj4/3.4.0/proj4.xsd → ...TA-INF/schemas/crs/stores/proj4/proj4.xsd b/.../schemas/crs/stores/proj4/3.4.0/proj4.xsd → ...TA-INF/schemas/crs/stores/proj4/proj4.xsd
@@ -5,7 +5,7 @@
 	elementFormDefault="qualified" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
 	jaxb:version="2.1">
 	<import namespace="http://www.deegree.org/crs/store"
-		schemaLocation="../../store.xsd" />
+		schemaLocation="" />
 	<annotation>
 		<appinfo>
 			<jaxb:schemaBindings>

diff --git a/...deegree-core-db/src/main/java/org/deegree/db/legacy/LegacyConnectionProviderProvider.java b/...deegree-core-db/src/main/java/org/deegree/db/legacy/LegacyConnectionProviderProvider.java
@@ -59,7 +59,7 @@ Occam Labs UG (haftungsbeschränkt)
  */
 public class LegacyConnectionProviderProvider extends ConnectionProviderProvider {
 
-    static final URL SCHEMA_URL = LegacyConnectionProviderProvider.class.getResource( "/META-INF/schemas/jdbc/3.4.0/jdbc.xsd" );
+    static final URL SCHEMA_URL = LegacyConnectionProviderProvider.class.getResource( "/META-INF/schemas/jdbc/jdbc.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...s/META-INF/schemas/jdbc/3.4.0/example.xml → ...sources/META-INF/schemas/jdbc/example.xml b/...s/META-INF/schemas/jdbc/3.4.0/example.xml → ...sources/META-INF/schemas/jdbc/example.xml
diff --git a/...rces/META-INF/schemas/jdbc/3.4.0/jdbc.xsd → .../resources/META-INF/schemas/jdbc/jdbc.xsd b/...rces/META-INF/schemas/jdbc/3.4.0/jdbc.xsd → .../resources/META-INF/schemas/jdbc/jdbc.xsd
diff --git a/deegree-core/deegree-core-gdal/src/main/java/org/deegree/commons/gdal/GdalSettings.java b/deegree-core/deegree-core-gdal/src/main/java/org/deegree/commons/gdal/GdalSettings.java
@@ -63,7 +63,7 @@ public class GdalSettings implements Initializable, Destroyable {
 
     private static final Logger LOG = getLogger( GdalSettings.class );
 
-    private static final URL CONFIG_SCHEMA = GdalSettings.class.getResource( "/META-INF/schemas/commons/gdal/3.4.0/gdal.xsd" );
+    private static final URL CONFIG_SCHEMA = GdalSettings.class.getResource( "/META-INF/schemas/commons/gdal/gdal.xsd" );
 
     private static final String CONFIG_JAXB_PACKAGE = "org.deegree.commons.gdal.jaxb";
 

diff --git a/...as/commons/gdal/3.4.0/example_complex.xml → .../schemas/commons/gdal/example_complex.xml b/...as/commons/gdal/3.4.0/example_complex.xml → .../schemas/commons/gdal/example_complex.xml
diff --git a/...as/commons/gdal/3.4.0/example_minimal.xml → .../schemas/commons/gdal/example_minimal.xml b/...as/commons/gdal/3.4.0/example_minimal.xml → .../schemas/commons/gdal/example_minimal.xml
diff --git a/...A-INF/schemas/commons/gdal/3.4.0/gdal.xsd → ...es/META-INF/schemas/commons/gdal/gdal.xsd b/...A-INF/schemas/commons/gdal/3.4.0/gdal.xsd → ...es/META-INF/schemas/commons/gdal/gdal.xsd
diff --git a/...spatialmetadata/3.4.0/spatialmetadata.xsd → ...mmons/spatialmetadata/spatialmetadata.xsd b/...spatialmetadata/3.4.0/spatialmetadata.xsd → ...mmons/spatialmetadata/spatialmetadata.xsd
diff --git a/...TA-INF/schemas/layers/base/3.4.0/base.xsd → ...ces/META-INF/schemas/layers/base/base.xsd b/...TA-INF/schemas/layers/base/3.4.0/base.xsd → ...ces/META-INF/schemas/layers/base/base.xsd
@@ -12,8 +12,8 @@
     </appinfo>
   </annotation>
 
-  <import namespace="http://www.deegree.org/metadata/description" schemaLocation="http://schemas.deegree.org/commons/description/3.4.0/description.xsd" />
-  <import namespace="http://www.deegree.org/metadata/spatial" schemaLocation="http://schemas.deegree.org/commons/spatialmetadata/3.4.0/spatialmetadata.xsd" />
+  <import namespace="http://www.deegree.org/metadata/description" schemaLocation="../../commons/description/description.xsd" />
+  <import namespace="http://www.deegree.org/metadata/spatial" schemaLocation="../../commons/spatialmetadata/spatialmetadata.xsd" />
 
   <group name="LayerInfo">
     <sequence>

diff --git a/...atasource/remoteows/wfs/3.4.0/example.xml → ...emas/datasource/remoteows/wfs/example.xml b/...atasource/remoteows/wfs/3.4.0/example.xml → ...emas/datasource/remoteows/wfs/example.xml
diff --git a/...asource/remoteows/wfs/3.4.0/remotewfs.xsd → ...as/datasource/remoteows/wfs/remotewfs.xsd b/...asource/remoteows/wfs/3.4.0/remotewfs.xsd → ...as/datasource/remoteows/wfs/remotewfs.xsd
diff --git a/...eows/deegree-remoteows-wms/src/main/java/org/deegree/remoteows/wms/RemoteWMSProvider.java b/...eows/deegree-remoteows-wms/src/main/java/org/deegree/remoteows/wms/RemoteWMSProvider.java
@@ -54,7 +54,7 @@
  */
 public class RemoteWMSProvider extends RemoteOWSProvider {
 
-    private static final URL CONFIG_SCHEMA = RemoteWMSProvider.class.getResource( "/META-INF/schemas/remoteows/wms/3.4.0/remotewms.xsd" );
+    private static final URL CONFIG_SCHEMA = RemoteWMSProvider.class.getResource( "/META-INF/schemas/remoteows/wms/remotewms.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...atasource/remoteows/wms/3.4.0/example.xml → ...emas/datasource/remoteows/wms/example.xml b/...atasource/remoteows/wms/3.4.0/example.xml → ...emas/datasource/remoteows/wms/example.xml
diff --git a/...asource/remoteows/wms/3.4.0/remotewms.xsd → ...as/datasource/remoteows/wms/remotewms.xsd b/...asource/remoteows/wms/3.4.0/remotewms.xsd → ...as/datasource/remoteows/wms/remotewms.xsd
diff --git a/...F/schemas/remoteows/wms/3.4.0/example.xml → ...ETA-INF/schemas/remoteows/wms/example.xml b/...F/schemas/remoteows/wms/3.4.0/example.xml → ...ETA-INF/schemas/remoteows/wms/example.xml
diff --git a/...schemas/remoteows/wms/3.4.0/remotewms.xsd → ...A-INF/schemas/remoteows/wms/remotewms.xsd b/...schemas/remoteows/wms/3.4.0/remotewms.xsd → ...A-INF/schemas/remoteows/wms/remotewms.xsd
diff --git a/...s/deegree-remoteows-wmts/src/main/java/org/deegree/remoteows/wmts/RemoteWMTSProvider.java b/...s/deegree-remoteows-wmts/src/main/java/org/deegree/remoteows/wmts/RemoteWMTSProvider.java
@@ -53,7 +53,7 @@
  */
 public class RemoteWMTSProvider extends RemoteOWSProvider {
 
-    private static final URL CONFIG_SCHEMA = RemoteWMTSProvider.class.getResource( "/META-INF/schemas/remoteows/wmts/3.4.0/remotewmts.xsd" );
+    private static final URL CONFIG_SCHEMA = RemoteWMTSProvider.class.getResource( "/META-INF/schemas/remoteows/wmts/remotewmts.xsd" );
 
     private static final String CONFIG_NAMESPACE = "http://www.deegree.org/remoteows/wmts";
 

diff --git a/.../schemas/remoteows/wmts/3.4.0/example.xml → ...TA-INF/schemas/remoteows/wmts/example.xml b/.../schemas/remoteows/wmts/3.4.0/example.xml → ...TA-INF/schemas/remoteows/wmts/example.xml
diff --git a/...hemas/remoteows/wmts/3.4.0/remotewmts.xsd → ...INF/schemas/remoteows/wmts/remotewmts.xsd b/...hemas/remoteows/wmts/3.4.0/remotewmts.xsd → ...INF/schemas/remoteows/wmts/remotewmts.xsd
diff --git a/...egree-core-style/src/main/java/org/deegree/style/persistence/se/SEStyleStoreProvider.java b/...egree-core-style/src/main/java/org/deegree/style/persistence/se/SEStyleStoreProvider.java
@@ -57,7 +57,7 @@
  */
 public class SEStyleStoreProvider extends StyleStoreProvider {
 
-    private static final URL CONFIG_SCHEMA = SEStyleStoreProvider.class.getResource( "/META-INF/schemas/se/3.4.0/symbology-1.1.0.xsd" );
+    private static final URL CONFIG_SCHEMA = SEStyleStoreProvider.class.getResource( "/META-INF/schemas/se/symbology-1.1.0.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...urces/META-INF/schemas/se/3.4.0/lines.xml → ...n/resources/META-INF/schemas/se/lines.xml b/...urces/META-INF/schemas/se/3.4.0/lines.xml → ...n/resources/META-INF/schemas/se/lines.xml
diff --git a/...urces/META-INF/schemas/se/3.4.0/point.xml → ...n/resources/META-INF/schemas/se/point.xml b/...urces/META-INF/schemas/se/3.4.0/point.xml → ...n/resources/META-INF/schemas/se/point.xml
diff --git a/...es/META-INF/schemas/se/3.4.0/polygons.xml → ...esources/META-INF/schemas/se/polygons.xml b/...es/META-INF/schemas/se/3.4.0/polygons.xml → ...esources/META-INF/schemas/se/polygons.xml
diff --git a/.../META-INF/schemas/se/3.4.0/sldexample.xml → ...ources/META-INF/schemas/se/sldexample.xml b/.../META-INF/schemas/se/3.4.0/sldexample.xml → ...ources/META-INF/schemas/se/sldexample.xml
diff --git a/...-INF/schemas/se/3.4.0/symbology-1.1.0.xsd → ...s/META-INF/schemas/se/symbology-1.1.0.xsd b/...-INF/schemas/se/3.4.0/symbology-1.1.0.xsd → ...s/META-INF/schemas/se/symbology-1.1.0.xsd
diff --git a/...ources/META-INF/schemas/se/3.4.0/text.xml → ...in/resources/META-INF/schemas/se/text.xml b/...ources/META-INF/schemas/se/3.4.0/text.xml → ...in/resources/META-INF/schemas/se/text.xml
diff --git a/...ore-theme/src/main/java/org/deegree/theme/persistence/standard/StandardThemeProvider.java b/...ore-theme/src/main/java/org/deegree/theme/persistence/standard/StandardThemeProvider.java
@@ -56,7 +56,7 @@
  */
 public class StandardThemeProvider extends ThemeProvider {
 
-    private static final URL SCHEMA_URL = StandardThemeProvider.class.getResource( "/META-INF/schemas/themes/3.4.0/themes.xsd" );
+    private static final URL SCHEMA_URL = StandardThemeProvider.class.getResource( "/META-INF/schemas/themes/themes.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...META-INF/schemas/themes/3.4.0/example.xml → ...urces/META-INF/schemas/themes/example.xml b/...META-INF/schemas/themes/3.4.0/example.xml → ...urces/META-INF/schemas/themes/example.xml
diff --git a/.../META-INF/schemas/themes/3.4.0/themes.xsd → ...ources/META-INF/schemas/themes/themes.xsd b/.../META-INF/schemas/themes/3.4.0/themes.xsd → ...ources/META-INF/schemas/themes/themes.xsd
@@ -2,8 +2,8 @@
  targetNamespace="http://www.deegree.org/themes/standard" elementFormDefault="qualified" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
  jaxb:version="2.1" xmlns:d="http://www.deegree.org/metadata/description" xmlns:g="http://www.deegree.org/metadata/spatial">
 
- <import namespace="http://www.deegree.org/metadata/description" schemaLocation="http://schemas.deegree.org/commons/description/3.4.0/description.xsd" />
- <import namespace="http://www.deegree.org/metadata/spatial" schemaLocation="http://schemas.deegree.org/commons/spatialmetadata/3.4.0/spatialmetadata.xsd" />
+ <import namespace="http://www.deegree.org/metadata/description" schemaLocation="../commons/description/description.xsd" />
+ <import namespace="http://www.deegree.org/metadata/spatial" schemaLocation="../commons/spatialmetadata/spatialmetadata.xsd" />
 
  <annotation>
   <appinfo>

diff --git a/...src/main/java/org/deegree/coverage/raster/io/oraclegeoraster/OracleGeorasterProvider.java b/...src/main/java/org/deegree/coverage/raster/io/oraclegeoraster/OracleGeorasterProvider.java
@@ -45,7 +45,7 @@
  */
 public class OracleGeorasterProvider extends CoverageProvider {
 
-    private static final URL CONFIG_SCHEMA = OracleGeorasterProvider.class.getResource( "/META-INF/schemas/datasource/coverage/oraclegeoraster/3.4.0/oraclegeoraster.xsd" );
+    private static final URL CONFIG_SCHEMA = OracleGeorasterProvider.class.getResource( "/META-INF/schemas/datasource/coverage/oraclegeoraster/oraclegeoraster.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...overage/oraclegeoraster/3.4.0/example.xml → ...urce/coverage/oraclegeoraster/example.xml b/...overage/oraclegeoraster/3.4.0/example.xml → ...urce/coverage/oraclegeoraster/example.xml
diff --git a/...oraclegeoraster/3.4.0/oraclegeoraster.xsd → ...erage/oraclegeoraster/oraclegeoraster.xsd b/...oraclegeoraster/3.4.0/oraclegeoraster.xsd → ...erage/oraclegeoraster/oraclegeoraster.xsd
diff --git a/...y/src/main/java/org/deegree/feature/persistence/memory/NewMemoryFeatureStoreProvider.java b/...y/src/main/java/org/deegree/feature/persistence/memory/NewMemoryFeatureStoreProvider.java
@@ -59,7 +59,7 @@ Occam Labs UG (haftungsbeschränkt)
  */
 public class NewMemoryFeatureStoreProvider extends FeatureStoreProvider {
 
-    static final URL CONFIG_SCHEMA = NewMemoryFeatureStoreProvider.class.getResource( "/META-INF/schemas/datasource/feature/memory/3.4.0/memory.xsd" );
+    static final URL CONFIG_SCHEMA = NewMemoryFeatureStoreProvider.class.getResource( "/META-INF/schemas/datasource/feature/memory/memory.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...tasource/feature/memory/3.4.0/example.xml → ...mas/datasource/feature/memory/example.xml b/...tasource/feature/memory/3.4.0/example.xml → ...mas/datasource/feature/memory/example.xml
diff --git a/...atasource/feature/memory/3.4.0/memory.xsd → ...emas/datasource/feature/memory/memory.xsd b/...atasource/feature/memory/3.4.0/memory.xsd → ...emas/datasource/feature/memory/memory.xsd
diff --git a/...rc/main/java/org/deegree/feature/persistence/remotewfs/RemoteWFSFeatureStoreProvider.java b/...rc/main/java/org/deegree/feature/persistence/remotewfs/RemoteWFSFeatureStoreProvider.java
@@ -59,7 +59,7 @@ public class RemoteWFSFeatureStoreProvider extends FeatureStoreProvider {
 
     // private static final String CONFIG_JAXB_PACKAGE = "org.deegree.feature.persistence.remotewfs.jaxb";
 
-    private static final URL CONFIG_SCHEMA = RemoteWFSFeatureStoreProvider.class.getResource( "/META-INF/schemas/datasource/feature/remotewfs/3.4.0/remotewfs.xsd" );
+    private static final URL CONFIG_SCHEMA = RemoteWFSFeatureStoreProvider.class.getResource( "/META-INF/schemas/datasource/feature/remotewfs/remotewfs.xsd" );
 
     // // @Override
     // public RemoteWFSFeatureStore create( URL configURL )

diff --git a/...ource/feature/remotewfs/3.4.0/example.xml → .../datasource/feature/remotewfs/example.xml b/...ource/feature/remotewfs/3.4.0/example.xml → .../datasource/feature/remotewfs/example.xml
diff --git a/...rce/feature/remotewfs/3.4.0/remotewfs.xsd → ...atasource/feature/remotewfs/remotewfs.xsd b/...rce/feature/remotewfs/3.4.0/remotewfs.xsd → ...atasource/feature/remotewfs/remotewfs.xsd
diff --git a/...-shape/src/main/java/org/deegree/feature/persistence/shape/ShapeFeatureStoreProvider.java b/...-shape/src/main/java/org/deegree/feature/persistence/shape/ShapeFeatureStoreProvider.java
@@ -57,7 +57,7 @@ public class ShapeFeatureStoreProvider extends FeatureStoreProvider {
 
     static final String CONFIG_JAXB_PACKAGE = "org.deegree.feature.persistence.shape.jaxb";
 
-    private static final URL CONFIG_SCHEMA = ShapeFeatureStoreProvider.class.getResource( "/META-INF/schemas/datasource/feature/shape/3.4.0/shape.xsd" );
+    private static final URL CONFIG_SCHEMA = ShapeFeatureStoreProvider.class.getResource( "/META-INF/schemas/datasource/feature/shape/shape.xsd" );
 
     static class Mapping {
         String fieldname;

diff --git a/...datasource/feature/shape/3.4.0/mapped.xml → ...hemas/datasource/feature/shape/mapped.xml b/...datasource/feature/shape/3.4.0/mapped.xml → ...hemas/datasource/feature/shape/mapped.xml
diff --git a/.../datasource/feature/shape/3.4.0/shape.xsd → ...chemas/datasource/feature/shape/shape.xsd b/.../datasource/feature/shape/3.4.0/shape.xsd → ...chemas/datasource/feature/shape/shape.xsd
diff --git a/...datasource/feature/shape/3.4.0/simple.xml → ...hemas/datasource/feature/shape/simple.xml b/...datasource/feature/shape/3.4.0/simple.xml → ...hemas/datasource/feature/shape/simple.xml
diff --git a/...rc/main/java/org/deegree/feature/persistence/simplesql/SimpleSqlFeatureStoreProvider.java b/...rc/main/java/org/deegree/feature/persistence/simplesql/SimpleSqlFeatureStoreProvider.java
@@ -61,7 +61,7 @@ public class SimpleSqlFeatureStoreProvider extends FeatureStoreProvider {
 
     private static final String CONFIG_NS = "http://www.deegree.org/datasource/feature/simplesql";
 
-    static final URL CONFIG_SCHEMA = SimpleSqlFeatureStoreProvider.class.getResource( "/META-INF/schemas/datasource/feature/simplesql/3.4.0/simplesql.xsd" );
+    static final URL CONFIG_SCHEMA = SimpleSqlFeatureStoreProvider.class.getResource( "/META-INF/schemas/datasource/feature/simplesql/simplesql.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...ource/feature/simplesql/3.4.0/example.xml → .../datasource/feature/simplesql/example.xml b/...ource/feature/simplesql/3.4.0/example.xml → .../datasource/feature/simplesql/example.xml
diff --git a/...rce/feature/simplesql/3.4.0/simplesql.xsd → ...atasource/feature/simplesql/simplesql.xsd b/...rce/feature/simplesql/3.4.0/simplesql.xsd → ...atasource/feature/simplesql/simplesql.xsd
diff --git a/...estore-sql/src/main/java/org/deegree/feature/persistence/sql/SqlFeatureStoreProvider.java b/...estore-sql/src/main/java/org/deegree/feature/persistence/sql/SqlFeatureStoreProvider.java
@@ -61,7 +61,7 @@ public class SqlFeatureStoreProvider extends FeatureStoreProvider {
 
     private static final String CONFIG_NS = "http://www.deegree.org/datasource/feature/sql";
 
-    static final URL CONFIG_SCHEMA = SqlFeatureStoreProvider.class.getResource( "/META-INF/schemas/datasource/feature/sql/3.4.0/sql.xsd" );
+    static final URL CONFIG_SCHEMA = SqlFeatureStoreProvider.class.getResource( "/META-INF/schemas/datasource/feature/sql/sql.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...rce/feature/sql/3.4.0/example_complex.xml → ...atasource/feature/sql/example_complex.xml b/...rce/feature/sql/3.4.0/example_complex.xml → ...atasource/feature/sql/example_complex.xml
diff --git a/...rce/feature/sql/3.4.0/example_minimal.xml → ...atasource/feature/sql/example_minimal.xml b/...rce/feature/sql/3.4.0/example_minimal.xml → ...atasource/feature/sql/example_minimal.xml
diff --git a/...emas/datasource/feature/sql/3.4.0/sql.xsd → ...NF/schemas/datasource/feature/sql/sql.xsd b/...emas/datasource/feature/sql/3.4.0/sql.xsd → ...NF/schemas/datasource/feature/sql/sql.xsd
diff --git a/...istence/sql/org/deegree/feature/persistence/sql/config/SQLFeatureStoreConfigWriterIT.java b/...istence/sql/org/deegree/feature/persistence/sql/config/SQLFeatureStoreConfigWriterIT.java
@@ -75,7 +75,7 @@ private Schema sqlFeatureStore34Schema()
                             throws SAXException {
 
         URL schemaResource = SQLFeatureStoreConfigWriterIT.class.getResource(
-                                "/META-INF/schemas/datasource/feature/sql/3.4.0/sql.xsd" );
+                                "/META-INF/schemas/datasource/feature/sql/sql.xsd" );
         return SchemaFactory.w3cXmlSchemaFrom( schemaResource );
     }
 

diff --git a/...im-eo/src/main/java/org/deegree/metadata/persistence/ebrim/eo/EbrimEOMDStoreProvider.java b/...im-eo/src/main/java/org/deegree/metadata/persistence/ebrim/eo/EbrimEOMDStoreProvider.java
@@ -64,7 +64,7 @@ public class EbrimEOMDStoreProvider extends MetadataStoreProvider {
 
     private static final String CONFIG_NS = "http://www.deegree.org/datasource/metadata/ebrim/eo";
 
-    private static final String CONFIG_SCHEMA = "/META-INF/schemas/datasource/metadata/ebrim/eo/3.4.0/ebrim-eo.xsd";
+    private static final String CONFIG_SCHEMA = "/META-INF/schemas/datasource/metadata/ebrim/eo/ebrim-eo.xsd";
 
     // TODO : don't copy
     private List<String> readStatements( BufferedReader reader )

diff --git a/...urce/metadata/ebrim/eo/3.4.0/ebrim-eo.xsd → ...datasource/metadata/ebrim/eo/ebrim-eo.xsd b/...urce/metadata/ebrim/eo/3.4.0/ebrim-eo.xsd → ...datasource/metadata/ebrim/eo/ebrim-eo.xsd
diff --git a/...tadata/ebrim/eo/3.4.0/example_ebrimEO.xml → ...rce/metadata/ebrim/eo/example_ebrimEO.xml b/...tadata/ebrim/eo/3.4.0/example_ebrimEO.xml → ...rce/metadata/ebrim/eo/example_ebrimEO.xml
diff --git a/...main/java/org/deegree/metadata/iso/persistence/memory/ISOMemoryMetadataStoreProvider.java b/...main/java/org/deegree/metadata/iso/persistence/memory/ISOMemoryMetadataStoreProvider.java
@@ -58,7 +58,7 @@ public class ISOMemoryMetadataStoreProvider extends MetadataStoreProvider {
 
     private final static String CONFIG_NAMESPACE = "http://www.deegree.org/datasource/metadata/iso19139/memory";
 
-    private final static URL CONFIG_SCHEMA = ISOMemoryMetadataStore.class.getResource( "/META-INF/schemas/datasource/metadata/iso19139/memory/3.4.0/memory.xsd" );
+    private final static URL CONFIG_SCHEMA = ISOMemoryMetadataStore.class.getResource( "/META-INF/schemas/datasource/metadata/iso19139/memory/memory.xsd" );
 
     @Override
     public String[] getCreateStatements( SQLDialect dbType )

diff --git a/...etadata/iso19139/memory/3.4.0/example.xml → ...urce/metadata/iso19139/memory/example.xml b/...etadata/iso19139/memory/3.4.0/example.xml → ...urce/metadata/iso19139/memory/example.xml
diff --git a/...metadata/iso19139/memory/3.4.0/memory.xsd → ...ource/metadata/iso19139/memory/memory.xsd b/...metadata/iso19139/memory/3.4.0/memory.xsd → ...ource/metadata/iso19139/memory/memory.xsd
diff --git a/...tore-iso/src/main/java/org/deegree/metadata/iso/persistence/ISOMetadataStoreProvider.java b/...tore-iso/src/main/java/org/deegree/metadata/iso/persistence/ISOMetadataStoreProvider.java
@@ -140,6 +140,6 @@ public ResourceMetadata<MetadataStore<? extends MetadataRecord>> createFromLocat
 
     @Override
     public URL getSchema() {
-        return ISOMetadataStoreProvider.class.getResource( "/META-INF/schemas/datasource/metadata/iso19115/3.4.0/iso19115.xsd" );
+        return ISOMetadataStoreProvider.class.getResource( "/META-INF/schemas/datasource/metadata/iso19115/iso19115.xsd" );
     }
 }
diff --git a/...adata/iso19115/3.4.0/example_iso19115.xml → ...ce/metadata/iso19115/example_iso19115.xml b/...adata/iso19115/3.4.0/example_iso19115.xml → ...ce/metadata/iso19115/example_iso19115.xml
diff --git a/...urce/metadata/iso19115/3.4.0/iso19115.xsd → ...datasource/metadata/iso19115/iso19115.xsd b/...urce/metadata/iso19115/3.4.0/iso19115.xsd → ...datasource/metadata/iso19115/iso19115.xsd
diff --git a/...tore-cache/src/main/java/org/deegree/tile/persistence/cache/CachingTileStoreProvider.java b/...tore-cache/src/main/java/org/deegree/tile/persistence/cache/CachingTileStoreProvider.java
@@ -59,7 +59,7 @@ Occam Labs UG (haftungsbeschränkt)
 
 public class CachingTileStoreProvider extends TileStoreProvider {
 
-    private static final URL SCHEMA = CachingTileStoreProvider.class.getResource( "/META-INF/schemas/datasource/tile/cache/3.4.0/cache.xsd" );
+    private static final URL SCHEMA = CachingTileStoreProvider.class.getResource( "/META-INF/schemas/datasource/tile/cache/cache.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...mas/datasource/tile/cache/3.4.0/cache.xsd → ...F/schemas/datasource/tile/cache/cache.xsd b/...mas/datasource/tile/cache/3.4.0/cache.xsd → ...F/schemas/datasource/tile/cache/cache.xsd
diff --git a/...s/datasource/tile/cache/3.4.0/example.xml → ...schemas/datasource/tile/cache/example.xml b/...s/datasource/tile/cache/3.4.0/example.xml → ...schemas/datasource/tile/cache/example.xml
diff --git a/...re-commons/src/main/java/org/deegree/tile/tilematrixset/DefaultTileMatrixSetProvider.java b/...re-commons/src/main/java/org/deegree/tile/tilematrixset/DefaultTileMatrixSetProvider.java
@@ -73,7 +73,7 @@ public class DefaultTileMatrixSetProvider extends TileMatrixSetProvider {
 
     private static final String CONFIG_NAMESPACE = "http://www.deegree.org/datasource/tile/tilematrixset";
 
-    private static final URL SCHEMA_URL = DefaultTileMatrixSetProvider.class.getResource( "/META-INF/schemas/datasource/tile/tilematrixset/3.4.0/tilematrixset.xsd" );
+    private static final URL SCHEMA_URL = DefaultTileMatrixSetProvider.class.getResource( "/META-INF/schemas/datasource/tile/tilematrixset/tilematrixset.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...urce/tile/tilematrixset/3.4.0/example.xml → ...datasource/tile/tilematrixset/example.xml b/...urce/tile/tilematrixset/3.4.0/example.xml → ...datasource/tile/tilematrixset/example.xml
diff --git a/...ile/tilematrixset/3.4.0/tilematrixset.xsd → ...urce/tile/tilematrixset/tilematrixset.xsd b/...ile/tilematrixset/3.4.0/tilematrixset.xsd → ...urce/tile/tilematrixset/tilematrixset.xsd
diff --git a/...em/src/main/java/org/deegree/tile/persistence/filesystem/FileSystemTileStoreProvider.java b/...em/src/main/java/org/deegree/tile/persistence/filesystem/FileSystemTileStoreProvider.java
@@ -53,7 +53,7 @@ public class FileSystemTileStoreProvider extends TileStoreProvider {
 
     private static final String CONFIG_NAMESPACE = "http://www.deegree.org/datasource/tile/filesystem";
 
-    private static final URL CONFIG_SCHEMA = FileSystemTileStoreProvider.class.getResource( "/META-INF/schemas/datasource/tile/filesystem/3.4.0/filesystem.xsd" );
+    private static final URL CONFIG_SCHEMA = FileSystemTileStoreProvider.class.getResource( "/META-INF/schemas/datasource/tile/filesystem/filesystem.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...asource/tile/filesystem/3.4.0/example.xml → ...as/datasource/tile/filesystem/example.xml b/...asource/tile/filesystem/3.4.0/example.xml → ...as/datasource/tile/filesystem/example.xml
diff --git a/...urce/tile/filesystem/3.4.0/filesystem.xsd → ...datasource/tile/filesystem/filesystem.xsd b/...urce/tile/filesystem/3.4.0/filesystem.xsd → ...datasource/tile/filesystem/filesystem.xsd
@@ -3,7 +3,7 @@
   targetNamespace="http://www.deegree.org/datasource/tile/filesystem" xmlns:t="http://www.deegree.org/datasource/tile/filesystem"
   elementFormDefault="qualified" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.1">
 
-  <import namespace="http://www.deegree.org/metadata/spatial" schemaLocation="http://schemas.deegree.org/commons/spatialmetadata/3.4.0/spatialmetadata.xsd" />
+  <import namespace="http://www.deegree.org/metadata/spatial" schemaLocation="../../../commons/spatialmetadata/spatialmetadata.xsd" />
 
   <annotation>
     <appinfo>

diff --git a/...tilestore-gdal/src/main/java/org/deegree/tile/persistence/gdal/GdalTileStoreProvider.java b/...tilestore-gdal/src/main/java/org/deegree/tile/persistence/gdal/GdalTileStoreProvider.java
@@ -61,7 +61,7 @@ public class GdalTileStoreProvider extends TileStoreProvider {
 
     private static final String SCHEMA_NAMESPACE = "http://www.deegree.org/datasource/tile/gdal";
 
-    private static final URL SCHEMA_URL = GdalTileStoreProvider.class.getResource( "/META-INF/schemas/datasource/tile/gdal/3.4.0/gdal.xsd" );
+    private static final URL SCHEMA_URL = GdalTileStoreProvider.class.getResource( "/META-INF/schemas/datasource/tile/gdal/gdal.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...ore-gdal/src/main/java/org/deegree/tile/tilematrixset/gdal/GdalTileMatrixSetProvider.java b/...ore-gdal/src/main/java/org/deegree/tile/tilematrixset/gdal/GdalTileMatrixSetProvider.java
@@ -48,7 +48,7 @@ public class GdalTileMatrixSetProvider extends TileMatrixSetProvider {
 
     private static final String SCHEMA_NAMESPACE = "http://www.deegree.org/datasource/tile/tilematrixset/gdal";
 
-    private static final URL SCHEMA_URL = GdalTileMatrixSetProvider.class.getResource( "/META-INF/schemas/datasource/tile/tilematrixset/gdal/3.4.0/gdal.xsd" );
+    private static final URL SCHEMA_URL = GdalTileMatrixSetProvider.class.getResource( "/META-INF/schemas/datasource/tile/tilematrixset/gdal/gdal.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...ource/tile/gdal/3.4.0/example_complex.xml → .../datasource/tile/gdal/example_complex.xml b/...ource/tile/gdal/3.4.0/example_complex.xml → .../datasource/tile/gdal/example_complex.xml
diff --git a/...ource/tile/gdal/3.4.0/example_minimal.xml → .../datasource/tile/gdal/example_minimal.xml b/...ource/tile/gdal/3.4.0/example_minimal.xml → .../datasource/tile/gdal/example_minimal.xml
diff --git a/...hemas/datasource/tile/gdal/3.4.0/gdal.xsd → ...INF/schemas/datasource/tile/gdal/gdal.xsd b/...hemas/datasource/tile/gdal/3.4.0/gdal.xsd → ...INF/schemas/datasource/tile/gdal/gdal.xsd
diff --git a/...tile/tilematrixset/gdal/3.4.0/example.xml → ...ource/tile/tilematrixset/gdal/example.xml b/...tile/tilematrixset/gdal/3.4.0/example.xml → ...ource/tile/tilematrixset/gdal/example.xml
diff --git a/...ce/tile/tilematrixset/gdal/3.4.0/gdal.xsd → ...tasource/tile/tilematrixset/gdal/gdal.xsd b/...ce/tile/tilematrixset/gdal/3.4.0/gdal.xsd → ...tasource/tile/tilematrixset/gdal/gdal.xsd
diff --git a/...-geotiff/src/main/java/org/deegree/tile/persistence/geotiff/GeoTiffTileStoreProvider.java b/...-geotiff/src/main/java/org/deegree/tile/persistence/geotiff/GeoTiffTileStoreProvider.java
@@ -59,7 +59,7 @@ Occam Labs UG (haftungsbeschränkt)
  */
 public class GeoTiffTileStoreProvider extends TileStoreProvider {
 
-    private static final URL SCHEMA = GeoTiffTileStoreProvider.class.getResource( "/META-INF/schemas/datasource/tile/geotiff/3.4.0/geotiff.xsd" );
+    private static final URL SCHEMA = GeoTiffTileStoreProvider.class.getResource( "/META-INF/schemas/datasource/tile/geotiff/geotiff.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...ff/src/main/java/org/deegree/tile/tilematrixset/geotiff/GeoTiffTileMatrixSetProvider.java b/...ff/src/main/java/org/deegree/tile/tilematrixset/geotiff/GeoTiffTileMatrixSetProvider.java
@@ -44,7 +44,7 @@
  */
 public class GeoTiffTileMatrixSetProvider extends TileMatrixSetProvider {
 
-    private static final URL SCHEMA_URL = GeoTiffTileMatrixSetProvider.class.getResource( "/META-INF/schemas/datasource/tile/tilematrixset/3.4.0/geotiff/geotiff.xsd" );
+    private static final URL SCHEMA_URL = GeoTiffTileMatrixSetProvider.class.getResource( "/META-INF/schemas/datasource/tile/tilematrixset/geotiff/geotiff.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...datasource/tile/geotiff/3.4.0/example.xml → ...hemas/datasource/tile/geotiff/example.xml b/...datasource/tile/geotiff/3.4.0/example.xml → ...hemas/datasource/tile/geotiff/example.xml
diff --git a/...datasource/tile/geotiff/3.4.0/geotiff.xsd → ...hemas/datasource/tile/geotiff/geotiff.xsd b/...datasource/tile/geotiff/3.4.0/geotiff.xsd → ...hemas/datasource/tile/geotiff/geotiff.xsd
diff --git a/...e/tilematrixset/3.4.0/geotiff/example.xml → ...ce/tile/tilematrixset/geotiff/example.xml b/...e/tilematrixset/3.4.0/geotiff/example.xml → ...ce/tile/tilematrixset/geotiff/example.xml
diff --git a/...e/tilematrixset/3.4.0/geotiff/geotiff.xsd → ...ce/tile/tilematrixset/geotiff/geotiff.xsd b/...e/tilematrixset/3.4.0/geotiff/geotiff.xsd → ...ce/tile/tilematrixset/geotiff/geotiff.xsd