deegree#1120 - Update capabilities and metadata examples with current…

… information
lat-lon · May 12, 2023 · a7dbe7b · a7dbe7b
1 parent b452bde
commit a7dbe7b
Show file tree

Hide file tree

Showing 28 changed files with 475 additions and 445 deletions.
diff --git a/...l/deegree-protocol-commons/src/test/resources/org/deegree/protocol/ows/http/scenario1.xml b/...l/deegree-protocol-commons/src/test/resources/org/deegree/protocol/ows/http/scenario1.xml
@@ -11,28 +11,27 @@
     <ows:ServiceTypeVersion>1.1.0</ows:ServiceTypeVersion>
   </ows:ServiceIdentification>
   <ows:ServiceProvider>
-    <ows:ProviderName>lat/lon GmbH</ows:ProviderName>
-    <ows:ProviderSite xlink:href="http://www.lat-lon.de" />
+    <ows:ProviderName>deegree</ows:ProviderName>
+    <ows:ProviderSite xlink:href="https://www.deegree.org/" />
     <ows:ServiceContact>
-      <ows:IndividualName>Markus Schneider</ows:IndividualName>
-      <ows:PositionName>deegree TMC</ows:PositionName>
+      <ows:IndividualName>Gerhard Mercator</ows:IndividualName>
+      <ows:PositionName>Geograph</ows:PositionName>
       <ows:ContactInfo>
         <ows:Phone>
-          <ows:Voice>0228/18496-0</ows:Voice>
-          <ows:Facsimile>0228/18496-29</ows:Facsimile>
+          <ows:Voice>0123/123456</ows:Voice>
+          <ows:Facsimile>0123/123456</ows:Facsimile>
         </ows:Phone>
         <ows:Address>
-          <ows:DeliveryPoint>Aennchenstr. 19</ows:DeliveryPoint>
-          <ows:City>Bonn</ows:City>
-          <ows:AdministrativeArea>NRW</ows:AdministrativeArea>
-          <ows:PostalCode>53177</ows:PostalCode>
-          <ows:Country>Germany</ows:Country>
-          <ows:ElectronicMailAddress>[email protected]
-          </ows:ElectronicMailAddress>
+          <ows:DeliveryPoint>9450 SW Gemini Dr #42523</ows:DeliveryPoint>
+          <ows:City>Beaverton</ows:City>
+          <ows:AdministrativeArea>OR</ows:AdministrativeArea>
+          <ows:PostalCode>97008</ows:PostalCode>
+          <ows:Country>USA</ows:Country>
+          <ows:ElectronicMailAddress>[email protected]</ows:ElectronicMailAddress>
         </ows:Address>
         <ows:OnlineResource xlink:href="http://www.deegree.org" />
         <ows:HoursOfService>24x7</ows:HoursOfService>
-        <ows:ContactInstructions>Do not hesitate to call</ows:ContactInstructions>
+        <ows:ContactInstructions>Do not hesitate to email</ows:ContactInstructions>
       </ows:ContactInfo>
       <ows:Role>PointOfContact</ows:Role>
     </ows:ServiceContact>

diff --git a/...ol-wms/src/test/resources/org/deegree/protocol/wms/client/wms111-inspire-capabilities.xml b/...ol-wms/src/test/resources/org/deegree/protocol/wms/client/wms111-inspire-capabilities.xml
@@ -384,31 +384,31 @@ xmlns:inspire_common CDATA #FIXED
 <WMT_MS_Capabilities updateSequence="1.1.0" version="1.1.1">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree wms</Title>
-    <Abstract>wms reference implementation</Abstract>
+    <Title>deegree WMS 1.1.1 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
     <KeywordList>
       <Keyword>deegree</Keyword>
-      <Keyword>wms</Keyword>
+      <Keyword>WMS</Keyword>
     </KeywordList>
-    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://demo.deegree.org:80/deegree-wms/services?"
+    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://example.com/deegree-wms/services?"
       xlink:type="simple" />
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Poth</ContactPerson>
-        <ContactOrganization>lat/lon</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Technical Director</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0049228184960</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>00492281849629</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
     <Fees>none</Fees>
     <AccessConstraints>none</AccessConstraints>

diff --git a/...otocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms111.xml b/...otocol/deegree-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms111.xml
@@ -6,31 +6,31 @@
 <WMT_MS_Capabilities updateSequence="1.1.0" version="1.1.1">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree wms</Title>
-    <Abstract>wms reference implementation</Abstract>
+    <Title>deegree WMS 1.1.1 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
     <KeywordList>
       <Keyword>deegree</Keyword>
-      <Keyword>wms</Keyword>
+      <Keyword>WMS</Keyword>
     </KeywordList>
-    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://demo.deegree.org:80/deegree-wms/services?"
+    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://example.com/deegree-wms/services?"
       xlink:type="simple" />
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Poth</ContactPerson>
-        <ContactOrganization>lat/lon</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Technical Director</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0049228184960</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>00492281849629</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
     <Fees>none</Fees>
     <AccessConstraints>none</AccessConstraints>

diff --git a/...ee/protocol/wms/client/wms130-capabilities-getmap-endpoint-extra-params-no-amp-at-end.xml b/...ee/protocol/wms/client/wms130-capabilities-getmap-endpoint-extra-params-no-amp-at-end.xml
@@ -2,26 +2,26 @@
 <WMS_Capabilities xmlns="http://www.opengis.net/wms" version="1.3.0" updateSequence="0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sld="http://www.opengis.net/sld" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree 3 Utah Demo</Title>
-    <Abstract>WMS and WFS demonstration with Utah data</Abstract>
+    <Title>deegree WMS 1.3.0 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
     <OnlineResource xlink:type="simple" xlink:href="http://www.deegree.org"/>
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Schmitz</ContactPerson>
-        <ContactOrganization>lat/lon GmbH</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Software developer</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0228/18496-0</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>0228/18496-29</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
   </Service>
   <Capability>

diff --git a/...s/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-extraparams-amp.xml b/...s/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-extraparams-amp.xml
@@ -2,26 +2,26 @@
 <WMS_Capabilities xmlns="http://www.opengis.net/wms" version="1.3.0" updateSequence="0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sld="http://www.opengis.net/sld" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree 3 Utah Demo</Title>
-    <Abstract>WMS and WFS demonstration with Utah data</Abstract>
+    <Title>deegree WMS 1.3.0 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
     <OnlineResource xlink:type="simple" xlink:href="http://www.deegree.org"/>
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Schmitz</ContactPerson>
-        <ContactOrganization>lat/lon GmbH</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Software developer</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0228/18496-0</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>0228/18496-29</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
   </Service>
   <Capability>

diff --git a/...es/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-noquestionmark.xml b/...es/org/deegree/protocol/wms/client/wms130-capabilities-getmap-endpoint-noquestionmark.xml
@@ -2,26 +2,26 @@
 <WMS_Capabilities xmlns="http://www.opengis.net/wms" version="1.3.0" updateSequence="0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sld="http://www.opengis.net/sld" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree 3 Utah Demo</Title>
-    <Abstract>WMS and WFS demonstration with Utah data</Abstract>
+    <Title>deegree WMS 1.3.0 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
     <OnlineResource xlink:type="simple" xlink:href="http://www.deegree.org"/>
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Schmitz</ContactPerson>
-        <ContactOrganization>lat/lon GmbH</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Software developer</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0228/18496-0</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>0228/18496-29</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
   </Service>
   <Capability>

diff --git a/...e-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities.xml b/...e-protocol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-capabilities.xml
@@ -2,26 +2,26 @@
 <WMS_Capabilities xmlns="http://www.opengis.net/wms" version="1.3.0" updateSequence="0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sld="http://www.opengis.net/sld" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree 3 Utah Demo</Title>
-    <Abstract>WMS and WFS demonstration with Utah data</Abstract>
+    <Title>deegree WMS 1.3.0 capabilities</Title>
+    <Abstract>An example template for the deegree WMS</Abstract>
     <OnlineResource xlink:type="simple" xlink:href="http://www.deegree.org"/>
     <ContactInformation>
       <ContactPersonPrimary>
-        <ContactPerson>Andreas Schmitz</ContactPerson>
-        <ContactOrganization>lat/lon GmbH</ContactOrganization>
+        <ContactPerson>Gerhard Mercator</ContactPerson>
+        <ContactOrganization>deegree</ContactOrganization>
       </ContactPersonPrimary>
-      <ContactPosition>Software developer</ContactPosition>
+      <ContactPosition>Geographer</ContactPosition>
       <ContactAddress>
         <AddressType>postal</AddressType>
-        <Address>Aennchenstr. 19</Address>
-        <City>Bonn</City>
-        <StateOrProvince>NRW</StateOrProvince>
-        <PostCode>53177</PostCode>
-        <Country>Germany</Country>
+        <Address>9450 SW Gemini Dr #42523</Address>
+        <City>Beaverton</City>
+        <StateOrProvince>OR</StateOrProvince>
+        <PostCode>97008</PostCode>
+        <Country>USA</Country>
       </ContactAddress>
-      <ContactVoiceTelephone>0228/18496-0</ContactVoiceTelephone>
-      <ContactFacsimileTelephone>0228/18496-29</ContactFacsimileTelephone>
-      <ContactElectronicMailAddress>info@lat-lon.de</ContactElectronicMailAddress>
+      <ContactVoiceTelephone>0123/123456</ContactVoiceTelephone>
+      <ContactFacsimileTelephone>0123/123456</ContactFacsimileTelephone>
+      <ContactElectronicMailAddress>info@deegree.org</ContactElectronicMailAddress>
     </ContactInformation>
   </Service>
   <Capability>

diff --git a/...ol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-inspire-capabilities.xml b/...ol-wms/src/test/resources/org/deegree/protocol/wms/client/wms130-inspire-capabilities.xml
@@ -5,31 +5,31 @@
   xsi:schemaLocation="http://inspire.ec.europa.eu/schemas/inspire_vs/1.0 http://inspire.ec.europa.eu/schemas/inspire_vs/1.0/inspire_vs.xsd">
   <Service>
     <Name>WMS</Name>
-    <Title>deegree wms</Title>
-    <wms:Abstract xmlns:wms="http://www.opengis.net/wms">wms reference implementation</wms:Abstract>
+    <Title>deegree WMS 1.3.0 capabilities</Title>
+    <wms:Abstract xmlns:wms="http://www.opengis.net/wms">An example template for the deegree WMS</wms:Abstract>
     <wms:KeywordList xmlns:wms="http://www.opengis.net/wms">
       <wms:Keyword>deegree</wms:Keyword>
-      <wms:Keyword>wms</wms:Keyword>
+      <wms:Keyword>WMS</wms:Keyword>
     </wms:KeywordList>
-    <wms:OnlineResource xmlns:wms="http://www.opengis.net/wms" xlink:href="http://demo.deegree.org/deegree-wms-ri-130/services?"
+    <wms:OnlineResource xmlns:wms="http://www.opengis.net/wms" xlink:href="http://example.com/deegree-wms/services?"
       xlink:type="simple" />
     <wms:ContactInformation xmlns:wms="http://www.opengis.net/wms">
       <wms:ContactPersonPrimary>
-        <wms:ContactPerson>Andreas Poth</wms:ContactPerson>
-        <wms:ContactOrganization>lat/lon</wms:ContactOrganization>
+        <wms:ContactPerson>Gerhard Mercator</wms:ContactPerson>
+        <wms:ContactOrganization>deegree</wms:ContactOrganization>
       </wms:ContactPersonPrimary>
-      <wms:ContactPosition>Technical Director</wms:ContactPosition>
+      <wms:ContactPosition>Geographer</wms:ContactPosition>
       <wms:ContactAddress>
         <wms:AddressType>postal</wms:AddressType>
-        <wms:Address>Aennchenstr. 19</wms:Address>
-        <wms:City>Bonn</wms:City>
-        <wms:StateOrProvince>NRW</wms:StateOrProvince>
-        <wms:PostCode>53177</wms:PostCode>
-        <wms:Country>Germany</wms:Country>
+        <wms:Address>9450 SW Gemini Dr #42523</wms:Address>
+        <wms:City>Beaverton</wms:City>
+        <wms:StateOrProvince>OR</wms:StateOrProvince>
+        <wms:PostCode>97008</wms:PostCode>
+        <wms:Country>USA</wms:Country>
       </wms:ContactAddress>
-      <wms:ContactVoiceTelephone>0049228184960</wms:ContactVoiceTelephone>
-      <wms:ContactFacsimileTelephone>00492281849629</wms:ContactFacsimileTelephone>
-      <wms:ContactElectronicMailAddress>info@lat-lon.de</wms:ContactElectronicMailAddress>
+      <wms:ContactVoiceTelephone>0123/123456</wms:ContactVoiceTelephone>
+      <wms:ContactFacsimileTelephone>0123/123456</wms:ContactFacsimileTelephone>
+      <wms:ContactElectronicMailAddress>info@deegree.org</wms:ContactElectronicMailAddress>
     </wms:ContactInformation>
     <wms:Fees xmlns:wms="http://www.opengis.net/wms">none</wms:Fees>
     <wms:AccessConstraints xmlns:wms="http://www.opengis.net/wms">none</wms:AccessConstraints>