Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix example locations for deegree administration #1493

Merged
merged 5 commits into from
May 12, 2023
Merged

Fix example locations for deegree administration #1493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d9f664
#1470 - Initial fix for reported console issues
julianzz98 Feb 20, 2023
f0838b6
#1470 (#8781) - added schemaLocations
lgoltz Mar 7, 2023
73a0487
#1470 (#8781) - fixed examples of CoverageLayerStoreProvider and Tile…
lgoltz Mar 7, 2023
0a1471d
deegree#1470 (#8781) - added schemaLocations
lgoltz Mar 7, 2023
366843d
Merge remote-tracking branch 'origin/fixDeegreeConsole-1470' into fix…
lgoltz Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ce/metadata/iso19115/example_iso19115.xml → .../datasource/metadata/iso19115/example.xml
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion ...ree-tilestore-merge/src/main/resources/META-INF/schemas/datasource/tile/merge/example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<mer:MergingTileStore xmlns:mer="http://www.deegree.org/datasource/tile/merge">
<mer:MergingTileStore xmlns:mer="http://www.deegree.org/datasource/tile/merge"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.deegree.org/datasource/tile/merge https://schemas.deegree.org/3.5/datasource/tile/merge/merge.xsd">
<mer:TileMatrixSetId>string</mer:TileMatrixSetId>
<!--1 or more repetitions:-->
<mer:TileStoreId>string</mer:TileStoreId>
Expand Down
4 changes: 3 additions & 1 deletion ...ee-layers/deegree-layers-gdal/src/main/resources/META-INF/schemas/layers/gdal/example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<GDALLayers xmlns="http://www.deegree.org/layers/gdal" xmlns:d="http://www.deegree.org/metadata/description"
xmlns:l="http://www.deegree.org/layers/base" xmlns:s="http://www.deegree.org/metadata/spatial">
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">
<GDALLayer>
<l:Name>luchtfoto_2010</l:Name>
<d:Title>Orthophoto layer served from an ECW file</d:Title>
Expand Down
2 changes: 1 addition & 1 deletion ...console/resourceprovider/org.deegree.services.wps.provider.fme.FMEProcessProviderProvider
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name=FME-Server
example1_location=/META-INF/schemas/fme/example.xml
example1_location=/META-INF/schemas/processes/fme/example.xml
2 changes: 1 addition & 1 deletion ...onsole/resourceprovider/org.deegree.layer.persistence.coverage.CoverageLayerStoreProvider
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name=Coverage
example1_location=/META-INF/schemas/layers/tile/example.xml
example1_location=/META-INF/schemas/layers/coverage/example.xml
2 changes: 1 addition & 1 deletion ...TA-INF/console/resourceprovider/org.deegree.layer.persistence.tile.TileLayerStoreProvider
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name=Tile
example1_location=/META-INF/schemas/layers/coverage/example.xml
example1_location=/META-INF/schemas/layers/tile/example.xml
2 changes: 1 addition & 1 deletion ...NF/console/resourceprovider/org.deegree.metadata.iso.persistence.ISOMetadataStoreProvider
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ...deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<RemoteWMSThemes xmlns="http://www.deegree.org/themes/remotewms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.deegree.org/themes/remotewms remotewms.xsd">
xsi:schemaLocation="http://www.deegree.org/themes/remotewms http://schemas.deegree.org/3.5/themes/remotewms/remotewms.xsd">
<RemoteWMSId>d3</RemoteWMSId>
<LayerStoreId>d3</LayerStoreId>
</RemoteWMSThemes>