From 24c35b07807485b9c42da9896d6ef72f3965849f Mon Sep 17 00:00:00 2001 From: Lyn Elisa Goltz Date: Thu, 11 May 2023 15:53:26 +0200 Subject: [PATCH 1/3] #19 - relocated schema files --- .../ogcapi/{htmlview/3.4.0/example.xml => example_htmlview.xml} | 0 .../META-INF/schemas/ogcapi/{htmlview/3.4.0 => }/htmlview.xsd | 0 .../META-INF/schemas/ogcapi/{datasets/3.4.0 => }/datasets.xsd | 0 .../ogcapi/{datasets/3.4.0/example.xml => example_datasets.xml} | 0 .../ogcapi/{features/3.4.0/example.xml => example_features.xml} | 0 .../META-INF/schemas/ogcapi/{features/3.4.0 => }/features.xsd | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/{htmlview/3.4.0/example.xml => example_htmlview.xml} (100%) rename deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/{htmlview/3.4.0 => }/htmlview.xsd (100%) rename deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/{datasets/3.4.0 => }/datasets.xsd (100%) rename deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/{datasets/3.4.0/example.xml => example_datasets.xml} (100%) rename deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/{features/3.4.0/example.xml => example_features.xml} (100%) rename deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/{features/3.4.0 => }/features.xsd (100%) diff --git a/deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/htmlview/3.4.0/example.xml b/deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/example_htmlview.xml similarity index 100% rename from deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/htmlview/3.4.0/example.xml rename to deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/example_htmlview.xml diff --git a/deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/htmlview/3.4.0/htmlview.xsd b/deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/htmlview.xsd similarity index 100% rename from deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/htmlview/3.4.0/htmlview.xsd rename to deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/htmlview.xsd diff --git a/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets/3.4.0/datasets.xsd b/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets.xsd similarity index 100% rename from deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets/3.4.0/datasets.xsd rename to deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets.xsd diff --git a/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets/3.4.0/example.xml b/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/example_datasets.xml similarity index 100% rename from deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets/3.4.0/example.xml rename to deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/example_datasets.xml diff --git a/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features/3.4.0/example.xml b/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/example_features.xml similarity index 100% rename from deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features/3.4.0/example.xml rename to deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/example_features.xml diff --git a/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features/3.4.0/features.xsd b/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features.xsd similarity index 100% rename from deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features/3.4.0/features.xsd rename to deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features.xsd From 3bb80d7e07f7024ab447258e24bdc45910ee1325 Mon Sep 17 00:00:00 2001 From: Lyn Elisa Goltz Date: Thu, 11 May 2023 16:01:53 +0200 Subject: [PATCH 2/3] #19 - emoved configVersion, fixed some links --- .../htmlview/HtmlViewConfigProvider.java | 2 +- .../schemas/ogcapi/example_htmlview.xml | 5 +- .../META-INF/schemas/ogcapi/htmlview.xsd | 7 --- .../datasets/DatasetsConfigProvider.java | 2 +- .../META-INF/schemas/ogcapi/datasets.xsd | 7 --- .../schemas/ogcapi/example_datasets.xml | 7 ++- .../src/main/asciidoc/configuration.adoc | 15 ++---- .../org/deegree/services/oaf/OafProvider.java | 2 +- .../schemas/ogcapi/example_features.xml | 15 +++--- .../META-INF/schemas/ogcapi/features.xsd | 49 ++++++++----------- 10 files changed, 42 insertions(+), 69 deletions(-) diff --git a/deegree-ogcapi-config-htmlview/src/main/java/org/deegree/services/oaf/config/htmlview/HtmlViewConfigProvider.java b/deegree-ogcapi-config-htmlview/src/main/java/org/deegree/services/oaf/config/htmlview/HtmlViewConfigProvider.java index e12705dc..39548334 100644 --- a/deegree-ogcapi-config-htmlview/src/main/java/org/deegree/services/oaf/config/htmlview/HtmlViewConfigProvider.java +++ b/deegree-ogcapi-config-htmlview/src/main/java/org/deegree/services/oaf/config/htmlview/HtmlViewConfigProvider.java @@ -45,7 +45,7 @@ public ResourceMetadata 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/deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/example_htmlview.xml b/deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/example_htmlview.xml index f0e5bbb5..ce0df177 100644 --- a/deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/example_htmlview.xml +++ b/deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/example_htmlview.xml @@ -19,10 +19,9 @@ . #L% --> - + xsi:schemaLocation="http://www.deegree.org/ogcapi/htmlview htmlview.xsd"> https://wms.url.net/ diff --git a/deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/htmlview.xsd b/deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/htmlview.xsd index 453ba6f0..9437a189 100644 --- a/deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/htmlview.xsd +++ b/deegree-ogcapi-config-htmlview/src/main/resources/META-INF/schemas/ogcapi/htmlview.xsd @@ -52,13 +52,6 @@ - - - - - - - diff --git a/deegree-ogcapi-datasets/src/main/java/org/deegree/services/oaf/config/datasets/DatasetsConfigProvider.java b/deegree-ogcapi-datasets/src/main/java/org/deegree/services/oaf/config/datasets/DatasetsConfigProvider.java index 2c1ab76c..2a82565d 100644 --- a/deegree-ogcapi-datasets/src/main/java/org/deegree/services/oaf/config/datasets/DatasetsConfigProvider.java +++ b/deegree-ogcapi-datasets/src/main/java/org/deegree/services/oaf/config/datasets/DatasetsConfigProvider.java @@ -45,7 +45,7 @@ public ResourceMetadata 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/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets.xsd b/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets.xsd index f8411b58..9333ad03 100644 --- a/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets.xsd +++ b/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets.xsd @@ -24,13 +24,6 @@ - - - - - - - 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 index d66671ef..ec757135 100644 --- 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 @@ -1,7 +1,6 @@ - + deegree Datasets Description of deegree Datasets diff --git a/deegree-ogcapi-documentation/src/main/asciidoc/configuration.adoc b/deegree-ogcapi-documentation/src/main/asciidoc/configuration.adoc index 755955e7..e1de090f 100644 --- 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 ---- + xsi:schemaLocation="http://www.deegree.org/ogcapi/datasets http://schemas.deegree.org/ogcapi/datasets.xsd"> Datasets Title Datasets Description @@ -133,8 +132,7 @@ Each dataset is configured in a separate file. The following example shows a min ---- + xsi:schemaLocation="http://www.deegree.org/ogcapi/features http://schemas.deegree.org/ogcapi/features.xsd"> streets @@ -158,8 +156,7 @@ The next example shows a complete configuration for a dataset called "trees" wit ---- + xsi:schemaLocation="http://www.deegree.org/ogcapi/features http://schemas.deegree.org/ogcapi/features.xsd"> trees @@ -293,8 +290,7 @@ The following excerpt of the _streets_metadata.xml_ shows which options are avai ---- + xsi:schemaLocation="http://www.deegree.org/services/metadata https://schemas.deegree.org/3.5/services/metadata/metadata.xsd"> deegree OGC API - Features @@ -381,8 +377,7 @@ To configure the HTML encoding a configuration file can be used. The following e ---- + xsi:schemaLocation="http://www.deegree.org/ogcapi/htmlview http://schemas.deegree.org/ogcapi/htmlview.xsd"> ../html/lgv.css https://www.hamburg.de/legalNotice/ 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 index d51964b8..c1223b2b 100644 --- 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 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/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/example_features.xml b/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/example_features.xml index 18f642f6..2f09c7fb 100644 --- a/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/example_features.xml +++ b/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/example_features.xml @@ -1,7 +1,6 @@ - + xsi:schemaLocation="http://www.deegree.org/ogcapi/features features.xsd"> test @@ -36,11 +35,13 @@ - - + - - + \ No newline at end of file diff --git a/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features.xsd b/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features.xsd index b00324d3..265d97b1 100644 --- a/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features.xsd +++ b/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features.xsd @@ -25,42 +25,35 @@ - - - - - - - - - + + + + + + + + + - - - - + + + + - + - - - - - - - - + - - - - - - + + + + + + From fc40429f0562104e68704533d59eb16450b500e8 Mon Sep 17 00:00:00 2001 From: Lyn Elisa Goltz Date: Thu, 11 May 2023 17:07:52 +0200 Subject: [PATCH 3/3] #19 - fixed schemaLocation, switched to https --- .../src/main/asciidoc/configuration.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deegree-ogcapi-documentation/src/main/asciidoc/configuration.adoc b/deegree-ogcapi-documentation/src/main/asciidoc/configuration.adoc index e1de090f..0fda56ad 100644 --- a/deegree-ogcapi-documentation/src/main/asciidoc/configuration.adoc +++ b/deegree-ogcapi-documentation/src/main/asciidoc/configuration.adoc @@ -86,7 +86,7 @@ To provide general information about the datasets provider the following configu ---- + xsi:schemaLocation="http://www.deegree.org/ogcapi/datasets https://schemas.deegree.org/ogcapi/1.3/datasets.xsd"> Datasets Title Datasets Description @@ -132,7 +132,7 @@ Each dataset is configured in a separate file. The following example shows a min ---- + xsi:schemaLocation="http://www.deegree.org/ogcapi/features https://schemas.deegree.org/ogcapi/1.3/features.xsd"> streets @@ -156,7 +156,7 @@ The next example shows a complete configuration for a dataset called "trees" wit ---- + xsi:schemaLocation="http://www.deegree.org/ogcapi/features https://schemas.deegree.org/ogcapi/1.3/features.xsd"> trees @@ -377,7 +377,7 @@ To configure the HTML encoding a configuration file can be used. The following e ---- + xsi:schemaLocation="http://www.deegree.org/ogcapi/htmlview https://schemas.deegree.org/ogcapi/1.3/htmlview.xsd"> ../html/lgv.css https://www.hamburg.de/legalNotice/