Merge pull request #98 from lat-lon/relocateSchemaFiles-19

Relocate schema files for deegree OGCAPI to schemas/ogcapi
deegree · Dec 1, 2023 · 59c68cf · 59c68cf
2 parents 372c8ee + fc40429
commit 59c68cf
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 79 deletions.
diff --git a/...mlview/src/main/java/org/deegree/services/oaf/config/htmlview/HtmlViewConfigProvider.java b/...mlview/src/main/java/org/deegree/services/oaf/config/htmlview/HtmlViewConfigProvider.java
@@ -45,7 +45,7 @@ public ResourceMetadata<HtmlViewConfigResource> createFromLocation( Workspace wo
 
     @Override
     public URL getSchema() {
-        return HtmlViewConfigProvider.class.getResource( "/META-INF/schemas/ogcapi/htmlview/3.4.0/htmlview.xsd" );
+        return HtmlViewConfigProvider.class.getResource( "/META-INF/schemas/ogcapi/htmlview.xsd" );
     }
 
 }
diff --git a/...schemas/ogcapi/htmlview/3.4.0/example.xml → ...A-INF/schemas/ogcapi/example_htmlview.xml b/...schemas/ogcapi/htmlview/3.4.0/example.xml → ...A-INF/schemas/ogcapi/example_htmlview.xml
@@ -19,10 +19,9 @@
   <http://www.gnu.org/licenses/lgpl-2.1.html>.
   #L%
   -->
-<HtmlView configVersion="3.4.0"
-          xmlns="http://www.deegree.org/services/oaf/htmlviewconfig"
+<HtmlView xmlns="http://www.deegree.org/ogcapi/htmlview"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://www.deegree.org/services/oaf/htmlviewconfig htmlviewconfig.xsd">
+          xsi:schemaLocation="http://www.deegree.org/ogcapi/htmlview htmlview.xsd">
 
   <Map>
     <WMSUrl version="1.3.0">https://wms.url.net/</WMSUrl>

diff --git a/...chemas/ogcapi/htmlview/3.4.0/htmlview.xsd → ...rces/META-INF/schemas/ogcapi/htmlview.xsd b/...chemas/ogcapi/htmlview/3.4.0/htmlview.xsd → ...rces/META-INF/schemas/ogcapi/htmlview.xsd
@@ -52,13 +52,6 @@
           </complexType>
         </element>
       </sequence>
-      <attribute name="configVersion" use="required">
-        <simpleType>
-          <restriction base="string">
-            <enumeration value="3.4.0"/>
-          </restriction>
-        </simpleType>
-      </attribute>
     </complexType>
   </element>
 </schema>
diff --git a/...tasets/src/main/java/org/deegree/services/oaf/config/datasets/DatasetsConfigProvider.java b/...tasets/src/main/java/org/deegree/services/oaf/config/datasets/DatasetsConfigProvider.java
@@ -45,7 +45,7 @@ public ResourceMetadata<DatasetsConfigResource> createFromLocation( Workspace wo
 
     @Override
     public URL getSchema() {
-        return DatasetsConfigProvider.class.getResource( "/META-INF/schemas/ogcapi/datasets/3.4.0/datasets.xsd" );
+        return DatasetsConfigProvider.class.getResource( "/META-INF/schemas/ogcapi/datasets.xsd" );
     }
 
 }
diff --git a/...chemas/ogcapi/datasets/3.4.0/datasets.xsd → ...rces/META-INF/schemas/ogcapi/datasets.xsd b/...chemas/ogcapi/datasets/3.4.0/datasets.xsd → ...rces/META-INF/schemas/ogcapi/datasets.xsd
@@ -24,13 +24,6 @@
           </complexType>
         </element>
       </sequence>
-      <attribute name="configVersion" use="required">
-        <simpleType>
-          <restriction base="string">
-            <enumeration value="3.4.0"/>
-          </restriction>
-        </simpleType>
-      </attribute>
     </complexType>
   </element>
 

diff --git a/...ree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets/3.4.0/example.xml b/...ree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets/3.4.0/example.xml
diff --git a/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/example_datasets.xml b/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/example_datasets.xml
@@ -0,0 +1,13 @@
+<Datasets xmlns="http://www.deegree.org/ogcapi/datasets"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://www.deegree.org/ogcapi/datasets datasets.xsd">
+
+  <Title>deegree Datasets</Title>
+  <Description>Description of deegree Datasets</Description>
+  <Contact>
+    <Name>deegree</Name>
+    <Url>https://www.deegree.org</Url>
+    <EMail>info@deegree.org</EMail>
+  </Contact>
+
+</Datasets>
diff --git a/deegree-ogcapi-documentation/src/main/asciidoc/configuration.adoc b/deegree-ogcapi-documentation/src/main/asciidoc/configuration.adoc
@@ -86,8 +86,7 @@ To provide general information about the datasets provider the following configu
 ----
 <Datasets xmlns="http://www.deegree.org/ogcapi/datasets"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://www.deegree.org/ogcapi/datasets  http://schemas.deegree.org/ogcapi/datasets/3.4.0/datasets.xsd"
-          configVersion="3.4.0">
+          xsi:schemaLocation="http://www.deegree.org/ogcapi/datasets  https://schemas.deegree.org/ogcapi/1.3/datasets.xsd">
   <Title>Datasets Title</Title>
   <Description>Datasets Description</Description> <!--1-->
   <Contact>
@@ -133,8 +132,7 @@ Each dataset is configured in a separate file. The following example shows a min
 ----
 <deegreeOAF xmlns="http://www.deegree.org/ogcapi/features"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.deegree.org/ogcapi/features http://schemas.deegree.org/ogcapi/features/3.4.0/features.xsd"
-            configVersion="3.4.0">
+            xsi:schemaLocation="http://www.deegree.org/ogcapi/features https://schemas.deegree.org/ogcapi/1.3/features.xsd">
 
   <FeatureStoreId>streets</FeatureStoreId>  <!--1-->
 
@@ -158,8 +156,7 @@ The next example shows a complete configuration for a dataset called "trees" wit
 ----
 <deegreeOAF xmlns="http://www.deegree.org/ogcapi/features"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.deegree.org/ogcapi/features http://schemas.deegree.org/ogcapi/features/3.4.0/features.xsd"
-            configVersion="3.4.0">
+            xsi:schemaLocation="http://www.deegree.org/ogcapi/features https://schemas.deegree.org/ogcapi/1.3/features.xsd">
 
   <FeatureStoreId>trees</FeatureStoreId>  <!--1-->
 
@@ -293,8 +290,7 @@ The following excerpt of the _streets_metadata.xml_ shows which options are avai
 ----
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                         xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/services/metadata/3.4.0/metadata.xsd"
-                         configVersion="3.4.0">
+                         xsi:schemaLocation="http://www.deegree.org/services/metadata https://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
 
   <ServiceIdentification> <!--1-->
     <Title>deegree OGC API - Features</Title>
@@ -381,8 +377,7 @@ To configure the HTML encoding a configuration file can be used. The following e
 ----
 <HtmlView xmlns="http://www.deegree.org/ogcapi/htmlview"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://www.deegree.org/ogcapi/htmlview http://schemas.deegree.org/ogcapi/3.4.0/htmlview.xsd"
-          configVersion="3.4.0">
+          xsi:schemaLocation="http://www.deegree.org/ogcapi/htmlview https://schemas.deegree.org/ogcapi/1.3/htmlview.xsd">
 
   <CssFile>../html/lgv.css</CssFile>  <!--1-->
   <LegalNoticeUrl>https://www.hamburg.de/legalNotice/</LegalNoticeUrl> <!--2-->

diff --git a/deegree-ogcapi-features/src/main/java/org/deegree/services/oaf/OafProvider.java b/deegree-ogcapi-features/src/main/java/org/deegree/services/oaf/OafProvider.java
@@ -45,7 +45,7 @@ public ResourceMetadata<Resource> createFromLocation( Workspace workspace, Resou
 
     @Override
     public URL getSchema() {
-        return OafProvider.class.getResource( "/META-INF/schemas/ogcapi/features/3.4.0/features.xsd" );
+        return OafProvider.class.getResource( "/META-INF/schemas/ogcapi/features.xsd" );
     }
 
 }
diff --git a/...schemas/ogcapi/features/3.4.0/example.xml → ...A-INF/schemas/ogcapi/example_features.xml b/...schemas/ogcapi/features/3.4.0/example.xml → ...A-INF/schemas/ogcapi/example_features.xml
@@ -1,7 +1,6 @@
-<deegreeOAF configVersion="3.4.0"
-            xmlns="http://www.deegree.org/ogcapi/features"
+<deegreeOAF xmlns="http://www.deegree.org/ogcapi/features"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.deegree.org/ogcapi/features oaf_configuration.xsd">
+            xsi:schemaLocation="http://www.deegree.org/ogcapi/features features.xsd">
 
   <FeatureStoreId>test</FeatureStoreId>
 
@@ -36,11 +35,13 @@
   </Metadata>
 
   <ConfigureCollection id="River">
-  	<AddLink href="http://inspire.ec.europa.eu/featureconcept/Building" rel="tag" type="application/json" title="Feature concept Building"/>	
+    <AddLink href="http://inspire.ec.europa.eu/featureconcept/Building" rel="tag" type="application/json"
+             title="Feature concept Building"/>
   </ConfigureCollection>
-  
+
   <ConfigureCollections>
-  	<AddLink href="http://inspire.ec.europa.eu/featureconcept/Building" rel="tag" type="application/json" title="Feature concept Building"/>	
+    <AddLink href="http://inspire.ec.europa.eu/featureconcept/Building" rel="tag" type="application/json"
+             title="Feature concept Building"/>
   </ConfigureCollections>
-  
+
 </deegreeOAF>
diff --git a/...chemas/ogcapi/features/3.4.0/features.xsd → ...rces/META-INF/schemas/ogcapi/features.xsd b/...chemas/ogcapi/features/3.4.0/features.xsd → ...rces/META-INF/schemas/ogcapi/features.xsd
@@ -25,42 +25,35 @@
         </element>
         <element name="HtmlViewId" type="string" minOccurs="0"/>
         <element name="Metadata" type="oaf:MetadataType" minOccurs="0"/>
-        <element name="ConfigureCollection" minOccurs="0" maxOccurs="unbounded" >
-        	<complexType>
-        		<sequence>
-        			<element name="AddLink" minOccurs="0" maxOccurs="unbounded" type="oaf:AddLink"/>
-        		</sequence>
-        		<attribute name="id" type="string"/>
-        	</complexType>
-		</element>
-		
+        <element name="ConfigureCollection" minOccurs="0" maxOccurs="unbounded">
+          <complexType>
+            <sequence>
+              <element name="AddLink" minOccurs="0" maxOccurs="unbounded" type="oaf:AddLink"/>
+            </sequence>
+            <attribute name="id" type="string"/>
+          </complexType>
+        </element>
+
         <element name="ConfigureCollections" minOccurs="0" maxOccurs="unbounded">
-         <complexType>
-          <sequence>
-            <element name="AddLink" minOccurs="0" maxOccurs="unbounded" type="oaf:AddLink"/>
-          </sequence>
+          <complexType>
+            <sequence>
+              <element name="AddLink" minOccurs="0" maxOccurs="unbounded" type="oaf:AddLink"/>
+            </sequence>
           </complexType>
         </element>
-		
+
       </sequence>
-      <attribute name="configVersion" use="required">
-        <simpleType>
-          <restriction base="string">
-            <enumeration value="3.4.0"/>
-          </restriction>
-        </simpleType>
-      </attribute>
     </complexType>
   </element>
 
- 
+
   <complexType name="AddLink">
-      <attribute name="href" type="string"/>
-      <attribute name="rel" type="string"/>
-      <attribute name="type" type="string"/>
-      <attribute name="title" type="string"/>
-  </complexType> 
-  
+    <attribute name="href" type="string"/>
+    <attribute name="rel" type="string"/>
+    <attribute name="type" type="string"/>
+    <attribute name="title" type="string"/>
+  </complexType>
+
   <complexType name="DateTimePropertyType">
     <sequence>
       <element name="FeatureTypeName" type="QName"/>