From 2d9f6646b9448b10913c447a0a0233102dc93f8c Mon Sep 17 00:00:00 2001 From: Julian Zilz Date: Mon, 20 Feb 2023 23:29:07 +0100 Subject: [PATCH 1/4] #1470 - Initial fix for reported console issues --- .../metadata/iso19115/{example_iso19115.xml => example.xml} | 0 ...deegree.services.wps.provider.fme.FMEProcessProviderProvider | 2 +- ...eegree.layer.persistence.coverage.CoverageLayerStoreProvider | 2 +- .../org.deegree.layer.persistence.tile.TileLayerStoreProvider | 2 +- ...rg.deegree.metadata.iso.persistence.ISOMetadataStoreProvider | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/{example_iso19115.xml => example.xml} (100%) diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/example_iso19115.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/example.xml similarity index 100% rename from deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/example_iso19115.xml rename to deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/example.xml diff --git a/deegree-processproviders/deegree-processprovider-fme/src/main/resources/META-INF/console/resourceprovider/org.deegree.services.wps.provider.fme.FMEProcessProviderProvider b/deegree-processproviders/deegree-processprovider-fme/src/main/resources/META-INF/console/resourceprovider/org.deegree.services.wps.provider.fme.FMEProcessProviderProvider index b9de6d2e4e..d09a36e540 100755 --- a/deegree-processproviders/deegree-processprovider-fme/src/main/resources/META-INF/console/resourceprovider/org.deegree.services.wps.provider.fme.FMEProcessProviderProvider +++ b/deegree-processproviders/deegree-processprovider-fme/src/main/resources/META-INF/console/resourceprovider/org.deegree.services.wps.provider.fme.FMEProcessProviderProvider @@ -1,2 +1,2 @@ name=FME-Server -example1_location=/META-INF/schemas/fme/example.xml +example1_location=/META-INF/schemas/processes/fme/example.xml \ No newline at end of file diff --git a/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.coverage.CoverageLayerStoreProvider b/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.coverage.CoverageLayerStoreProvider index 162d9e92d9..86ea55a456 100644 --- a/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.coverage.CoverageLayerStoreProvider +++ b/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.coverage.CoverageLayerStoreProvider @@ -1,2 +1,2 @@ name=Coverage -example1_location=/META-INF/schemas/layers/tile/example.xml \ No newline at end of file +example1_location=/META-INF/schemas/layers/coverage/example.xml \ No newline at end of file diff --git a/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.tile.TileLayerStoreProvider b/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.tile.TileLayerStoreProvider index 59b7f2d492..f9a635ccbd 100644 --- a/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.tile.TileLayerStoreProvider +++ b/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.tile.TileLayerStoreProvider @@ -1,2 +1,2 @@ name=Tile -example1_location=/META-INF/schemas/layers/coverage/example.xml \ No newline at end of file +example1_location=/META-INF/schemas/layers/tile/example.xml \ No newline at end of file diff --git a/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.metadata.iso.persistence.ISOMetadataStoreProvider b/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.metadata.iso.persistence.ISOMetadataStoreProvider index 4a159dc2e4..d18408459b 100644 --- a/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.metadata.iso.persistence.ISOMetadataStoreProvider +++ b/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.metadata.iso.persistence.ISOMetadataStoreProvider @@ -1,2 +1,2 @@ name=ISO19115 -example1_location=/META-INF/schemas/datasource/metadata/iso19115/example_iso19115.xml +example1_location=/META-INF/schemas/datasource/metadata/iso19115/example.xml From f0838b65819a876cc9eb3481c436c0dca2ec53ac Mon Sep 17 00:00:00 2001 From: Lyn Elisa Goltz Date: Tue, 7 Mar 2023 07:48:44 +0100 Subject: [PATCH 2/4] #1470 (#8781) - added schemaLocations --- .../META-INF/schemas/datasource/tile/merge/example.xml | 4 +++- .../resources/META-INF/schemas/themes/remotewms/example.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/src/main/resources/META-INF/schemas/datasource/tile/merge/example.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/src/main/resources/META-INF/schemas/datasource/tile/merge/example.xml index f7f38b5763..6cc4cfe098 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/src/main/resources/META-INF/schemas/datasource/tile/merge/example.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/src/main/resources/META-INF/schemas/datasource/tile/merge/example.xml @@ -1,4 +1,6 @@ - + string string diff --git a/deegree-themes/deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/example.xml b/deegree-themes/deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/example.xml index 3dd3a2782b..e383a6fe7f 100644 --- a/deegree-themes/deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/example.xml +++ b/deegree-themes/deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/example.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.deegree.org/themes/remotewms https://schemas.deegree.org/3.5/themes/remotewms/remotewms.xsd"> d3 d3 From 73a048735659e4b7914adec463469cb9f3cbde5c Mon Sep 17 00:00:00 2001 From: Lyn Elisa Goltz Date: Tue, 7 Mar 2023 07:49:56 +0100 Subject: [PATCH 3/4] #1470 (#8781) - fixed examples of CoverageLayerStoreProvider and TileLayerStoreProvider --- ...eegree.layer.persistence.coverage.CoverageLayerStoreProvider | 2 +- .../org.deegree.layer.persistence.tile.TileLayerStoreProvider | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.coverage.CoverageLayerStoreProvider b/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.coverage.CoverageLayerStoreProvider index 162d9e92d9..86ea55a456 100644 --- a/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.coverage.CoverageLayerStoreProvider +++ b/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.coverage.CoverageLayerStoreProvider @@ -1,2 +1,2 @@ name=Coverage -example1_location=/META-INF/schemas/layers/tile/example.xml \ No newline at end of file +example1_location=/META-INF/schemas/layers/coverage/example.xml \ No newline at end of file diff --git a/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.tile.TileLayerStoreProvider b/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.tile.TileLayerStoreProvider index 59b7f2d492..f9a635ccbd 100644 --- a/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.tile.TileLayerStoreProvider +++ b/deegree-services/deegree-webservices/src/main/resources/META-INF/console/resourceprovider/org.deegree.layer.persistence.tile.TileLayerStoreProvider @@ -1,2 +1,2 @@ name=Tile -example1_location=/META-INF/schemas/layers/coverage/example.xml \ No newline at end of file +example1_location=/META-INF/schemas/layers/tile/example.xml \ No newline at end of file From 0a1471d0d1690f3dc64f34bc910ce644a941e2eb Mon Sep 17 00:00:00 2001 From: Lyn Elisa Goltz Date: Tue, 7 Mar 2023 09:12:55 +0100 Subject: [PATCH 4/4] deegree#1470 (#8781) - added schemaLocations --- .../main/resources/META-INF/schemas/layers/gdal/example.xml | 4 +++- .../resources/META-INF/schemas/themes/remotewms/example.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deegree-layers/deegree-layers-gdal/src/main/resources/META-INF/schemas/layers/gdal/example.xml b/deegree-layers/deegree-layers-gdal/src/main/resources/META-INF/schemas/layers/gdal/example.xml index 3df0c92046..d74f1dbc30 100644 --- a/deegree-layers/deegree-layers-gdal/src/main/resources/META-INF/schemas/layers/gdal/example.xml +++ b/deegree-layers/deegree-layers-gdal/src/main/resources/META-INF/schemas/layers/gdal/example.xml @@ -1,5 +1,7 @@ + xmlns:l="http://www.deegree.org/layers/base" xmlns:s="http://www.deegree.org/metadata/spatial" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.deegree.org/layers/gdal http://schemas.deegree.org/3.5/layers/gdal/gdal.xsd"> luchtfoto_2010 Orthophoto layer served from an ECW file diff --git a/deegree-themes/deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/example.xml b/deegree-themes/deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/example.xml index e383a6fe7f..77e414dd26 100644 --- a/deegree-themes/deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/example.xml +++ b/deegree-themes/deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/example.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.deegree.org/themes/remotewms http://schemas.deegree.org/3.5/themes/remotewms/remotewms.xsd"> d3 d3