Merge pull request #1496 from lat-lon/changeSchemaFolder-1495

Changed schema references to http://schemas.deegree.org/core/3.5
deegree · May 12, 2023 · b769b9a · b769b9a
2 parents 5c759db + 725a506
commit b769b9a
Show file tree

Hide file tree

Showing 324 changed files with 385 additions and 385 deletions.
diff --git a/...source/src/main/resources/META-INF/schemas/connectionprovider/datasource/example_jndi.xml b/...source/src/main/resources/META-INF/schemas/connectionprovider/datasource/example_jndi.xml
@@ -1,6 +1,6 @@
 <DataSourceConnectionProvider
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/core/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation / lookup of javax.sql.DataSource instance -->
   <DataSource javaClass="org.deegree.db.datasource.JndiLookup" factoryMethod="lookup">

diff --git a/...asource/src/main/resources/META-INF/schemas/connectionprovider/datasource/example_ucp.xml b/...asource/src/main/resources/META-INF/schemas/connectionprovider/datasource/example_ucp.xml
@@ -1,6 +1,6 @@
 <DataSourceConnectionProvider
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/core/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation / lookup of javax.sql.DataSource instance -->
   <DataSource javaClass="oracle.ucp.jdbc.PoolDataSourceFactory" factoryMethod="getPoolDataSource" />

diff --git a/...e/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/batchedmt/example.xml b/...e/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/batchedmt/example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <BatchedMTFileStore xmlns="http://www.deegree.org/datasource/3d/batchedmt/file"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/3d/batchedmt/file http://schemas.deegree.org/3.5/datasource/3d/batchedmt/file.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/3d/batchedmt/file http://schemas.deegree.org/core/3.5/datasource/3d/batchedmt/file.xsd">
   <Directory>../../../data/batchedmt</Directory>
   <MaxDirectMemory>500048576</MaxDirectMemory>
 </BatchedMTFileStore>
diff --git a/...ree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/file_example.xml b/...ree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/file_example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RenderableFileStore xmlns="http://www.deegree.org/datasource/3d/renderable/file"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/3d/renderable/file http://schemas.deegree.org/3.5/datasource/3d/renderable/file.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/3d/renderable/file http://schemas.deegree.org/core/3.5/datasource/3d/renderable/file.xsd">
   <EntityFile>../../../data/renderable/buildings/objects</EntityFile>
   <PrototypeFile>../../../data/renderable/buildings/prototypes</PrototypeFile>
 </RenderableFileStore>
diff --git a/...gree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/sql_example.xml b/...gree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/sql_example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RenderableSQLStore xmlns="http://www.deegree.org/datasource/3d/renderable/sql"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/3d/renderable/sql http://schemas.deegree.org/3.5/datasource/3d/renderable/sql.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/3d/renderable/sql http://schemas.deegree.org/core/3.5/datasource/3d/renderable/sql.xsd">
   <JDBCConnId>conn1</JDBCConnId>
   <EntityTable>table</EntityTable>
 </RenderableSQLStore>
diff --git a/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/proxy/example.xml b/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/proxy/example.xml
@@ -1,5 +1,5 @@
 <ProxyConfiguration xmlns="http://www.deegree.org/proxy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/proxy http://schemas.deegree.org/3.5/proxy/proxy.xsd"
+  xsi:schemaLocation="http://www.deegree.org/proxy http://schemas.deegree.org/core/3.5/proxy/proxy.xsd"
   overrideSystemSettings="true">
 
   <!-- set overrideSystemSettings above to true to be sure that these proxy settings are used -->

diff --git a/...ore-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/directory.xml b/...ore-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/directory.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MultiResolutionRaster xmlns="http://www.deegree.org/datasource/coverage/raster"
   originLocation="outer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/3.5/datasource/coverage/raster/raster.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/core/3.5/datasource/coverage/raster/raster.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <Resolution res="2" nodata="0">
     <!--

diff --git a/...-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/example.xml b/...-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/example.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <Pyramid xmlns="http://www.deegree.org/datasource/coverage/pyramid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/3.5/datasource/coverage/raster/pyramid.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/core/3.5/datasource/coverage/raster/pyramid.xsd">
   <PyramidFile>/tmp/test.tif</PyramidFile>
 </Pyramid>
diff --git a/...e-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/single.xml b/...e-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/single.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Raster xmlns="http://www.deegree.org/datasource/coverage/raster" originLocation="outer"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/3.5/datasource/coverage/raster/raster.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/core/3.5/datasource/coverage/raster/raster.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <!--
     This example shows the configuration of a RasterFile as datasource for deegree WMS. Please think about indicating

diff --git a/...e-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree/example.xml b/...e-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DeegreeCRSStore xmlns="http://www.deegree.org/crs/stores/deegree" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/deegree/deegree.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/deegree/deegree.xsd">
   <!-- [1] -->
   <File>...</File>
 </DeegreeCRSStore>
diff --git a/...-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree2/example.xml b/...-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree2/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Deegree2CRSStore xmlns="http://www.deegree.org/crs/stores/deegree2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/deegree2/deegree2.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/deegree2/deegree2.xsd">
   <!-- [1] -->
   <File>...</File>
 </Deegree2CRSStore>
diff --git a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/gml/example.xml b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/gml/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <GMLCRSStore xmlns="http://www.deegree.org/crs/stores/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/gml/gml.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/gml/gml.xsd">
   <!-- ONE of -->
   <GMLFile>...</GMLFile>
   <!-- or (must have an constructur as: GMLResourceClass(GMLCRSStore store, Map<String, List<String>> params ) -->

diff --git a/...ree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/proj4/example.xml b/...ree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/proj4/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <PROJ4CRSStore xmlns="http://www.deegree.org/crs/stores/proj4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/proj4/proj4.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/proj4/proj4.xsd">
   <!-- [1] -->
   <File>...</File>
 </PROJ4CRSStore>
diff --git a/...re-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/crs-definitions.xml b/...re-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/crs-definitions.xml
@@ -2,7 +2,7 @@
 <crs:CRSDefinitions xmlns:crs="http://www.deegree.org/crs"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                     configVersion="3.0.0"
-                    xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+                    xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
         <crs:GeographicCRS>
                 <crs:Id>epsg:4002</crs:Id>
                 <crs:Id>http://www.opengis.net/gml/srs/epsg.xml#4002</crs:Id>

diff --git a/...-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/datum-definitions.xml b/...-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/datum-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<crs:DatumDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:DatumDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:GeodeticDatum>
       <crs:Id>epsg:6005</crs:Id>
       <crs:Name>Not specified (based on Bessel Modified ellipsoid)</crs:Name>

diff --git a/...src/main/resources/org/deegree/cs/persistence/deegree/d3/config/ellipsoid-definitions.xml b/...src/main/resources/org/deegree/cs/persistence/deegree/d3/config/ellipsoid-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<crs:EllipsoidDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:EllipsoidDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:Ellipsoid>
       <crs:Id>ellipsoid_81</crs:Id>
       <crs:Name>Proj4 defined ellipsoid</crs:Name>

diff --git a/...ore-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/pm-definitions.xml b/...ore-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/pm-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:PMDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:PMDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:PrimeMeridian>
       <crs:Id>epsg:8908</crs:Id>
       <crs:Id>urn:ogc:def:crs:epsg::8908</crs:Id>

diff --git a/...rc/main/resources/org/deegree/cs/persistence/deegree/d3/config/projection-definitions.xml b/...rc/main/resources/org/deegree/cs/persistence/deegree/d3/config/projection-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:ProjectionDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:ProjectionDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
 	<crs:LambertAzimuthalEqualArea>
 		<crs:Id>epsg:19986</crs:Id>
 		<crs:Name>Europe Equal Area 2001</crs:Name>

diff --git a/...ain/resources/org/deegree/cs/persistence/deegree/d3/config/transformation-definitions.xml b/...ain/resources/org/deegree/cs/persistence/deegree/d3/config/transformation-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:TransformationDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:TransformationDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
   <crs:Helmert>
     <crs:Id>epsg:1173</crs:Id>
     <crs:Id>urn:opengis:def:crs:epsg::1173</crs:Id>

diff --git a/...deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/parser-files.xml b/...deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/parser-files.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <crs:CRSConfiguration xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
   <crs:ProjectionsFile>config/projection-definitions.xml</crs:ProjectionsFile>
   <crs:TransformationsFile>config/transformation-definitions.xml</crs:TransformationsFile>
   <crs:PrimeMeridiansFile>config/pm-definitions.xml</crs:PrimeMeridiansFile>

diff --git a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/default.xml b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/default.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DeegreeCRSStore xmlns="http://www.deegree.org/crs/stores/deegree" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/deegree/deegree.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/deegree/deegree.xsd">
   <!-- [1] -->
   <File>deegree/d3/parser-files.xml</File>
 </DeegreeCRSStore>
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/deegree.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/deegree.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DeegreeCRSStore xmlns="http://www.deegree.org/crs/stores/deegree" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/deegree/deegree.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/deegree/deegree.xsd">
   <!-- [1] -->
   <File>files/parser-files.xml</File>
 </DeegreeCRSStore>
diff --git a/...re-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/crs-definitions.xml b/...re-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/crs-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<crs:CRSDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd" version="0.5.0">
+<crs:CRSDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd" version="0.5.0">
 	<crs:GeographicCRS>
     <crs:Id>epsg:4002</crs:Id>
     <crs:Id>http://www.opengis.net/gml/srs/epsg.xml#4002</crs:Id>

diff --git a/...-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/datum-definitions.xml b/...-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/datum-definitions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <crs:DatumDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
   <crs:GeodeticDatum>
     <crs:Id>epsg:6200</crs:Id>
     <crs:Name>Pulkovo 1995</crs:Name>

diff --git a/...src/test/resources/org/deegree/cs/persistence/crs/files/deegree/ellipsoid-definitions.xml b/...src/test/resources/org/deegree/cs/persistence/crs/files/deegree/ellipsoid-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<crs:EllipsoidDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:EllipsoidDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:Ellipsoid>
       <crs:Id>epsg:7002</crs:Id>
       <crs:Name>Airy Modified 1849</crs:Name>

diff --git a/...ore-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/pm-definitions.xml b/...ore-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/pm-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:PMDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:PMDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:PrimeMeridian>
       <crs:Id>epsg:8901</crs:Id>
       <crs:Name>Greenwich</crs:Name>

diff --git a/...rc/test/resources/org/deegree/cs/persistence/crs/files/deegree/projection-definitions.xml b/...rc/test/resources/org/deegree/cs/persistence/crs/files/deegree/projection-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:ProjectionDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:ProjectionDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
 	<crs:TransverseMercator>
     <crs:Id>epsg:16210</crs:Id>
 		<crs:Name>6-degree Gauss-Kruger zone 10</crs:Name>

diff --git a/...est/resources/org/deegree/cs/persistence/crs/files/deegree/transformation-definitions.xml b/...est/resources/org/deegree/cs/persistence/crs/files/deegree/transformation-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:TransformationDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:TransformationDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
   <crs:Helmert>
     <crs:Id>epsg:1173</crs:Id>
     <crs:Id>urn:opengis:def:crs:epsg::1173</crs:Id>

diff --git a/.../deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/parser-files.xml b/.../deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/parser-files.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <crs:CRSConfiguration xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
   <crs:ProjectionsFile>deegree/projection-definitions.xml</crs:ProjectionsFile>
   <crs:TransformationsFile>deegree/transformation-definitions.xml</crs:TransformationsFile>
   <crs:PrimeMeridiansFile>deegree/pm-definitions.xml</crs:PrimeMeridiansFile>

diff --git a/...ree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/gml-store1.xml b/...ree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/gml-store1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <GMLCRSStore xmlns="http://www.deegree.org/crs/stores/gml"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/gml/gml.xsd"
+	xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/gml/gml.xsd"
 	transformationType="NTV2">
 	<GMLFile>files/gmlDictionary1.xml</GMLFile>
 </GMLCRSStore>
diff --git a/...egree-core-cs/src/test/resources/org/deegree/cs/persistence/deegree/d2/deegree2-store.xml b/...egree-core-cs/src/test/resources/org/deegree/cs/persistence/deegree/d2/deegree2-store.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <Deegree2CRSStore xmlns="http://www.deegree.org/crs/stores/deegree2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/deegree/deegree2.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/deegree/deegree2.xsd">
   <File>deegree-crs-configuration.xml</File>
 </Deegree2CRSStore>
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/gml/gml-store.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/gml/gml-store.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <GMLCRSStore xmlns="http://www.deegree.org/crs/stores/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/gml/gml.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/gml/gml.xsd">
   <GMLFile>gmlDictionary.xml</GMLFile>
 </GMLCRSStore>
diff --git a/deegree-core/deegree-core-db/src/main/resources/META-INF/schemas/jdbc/example.xml b/deegree-core/deegree-core-db/src/main/resources/META-INF/schemas/jdbc/example.xml
@@ -1,5 +1,5 @@
 <JDBCConnection xmlns="http://www.deegree.org/jdbc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/3.5/jdbc/jdbc.xsd">
+  xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/core/3.5/jdbc/jdbc.xsd">
 
   <!-- [1] JDBC URL (without username / password) -->
   <Url>jdbc:postgresql://localhost:5432/${DB_NAME}</Url>

diff --git a/...re/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/example_complex.xml b/...re/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/example_complex.xml
@@ -1,5 +1,5 @@
 <GDALSettings xmlns="http://www.deegree.org/gdal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/gdal http://schemas.deegree.org/3.5/commons/gdal/gdal.xsd" />
+  xsi:schemaLocation="http://www.deegree.org/gdal http://schemas.deegree.org/core/3.5/commons/gdal/gdal.xsd" />
   <OpenDatasets>10</OpenDatasets>
   <GDALOption name="GDAL_CACHEMAX">1000</GDALOption>
   <GDALOption name="ECW_CACHE_MAXMEM">419430400</GDALOption>

diff --git a/...re/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/example_minimal.xml b/...re/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/example_minimal.xml
@@ -1,4 +1,4 @@
 <GDALSettings xmlns="http://www.deegree.org/gdal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/gdal http://schemas.deegree.org/3.5/commons/gdal/gdal.xsd">
+  xsi:schemaLocation="http://www.deegree.org/gdal http://schemas.deegree.org/core/3.5/commons/gdal/gdal.xsd">
   <OpenDatasets>5</OpenDatasets>
 </GDALSettings>
diff --git a/...ee-remoteows-wfs/src/main/resources/META-INF/schemas/datasource/remoteows/wfs/example.xml b/...ee-remoteows-wfs/src/main/resources/META-INF/schemas/datasource/remoteows/wfs/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <RemoteWFS xmlns="http://www.deegree.org/datasource/remoteows/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/remoteows/wfs http://schemas.deegree.org/3.5/datasource/remoteows/wfs/remotewfs.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/remoteows/wfs http://schemas.deegree.org/core/3.5/datasource/remoteows/wfs/remotewfs.xsd"
  >
   <CapabilitiesDocumentLocation location="http://demo.deegree.org/..." />
 </RemoteWFS>