[mapserver-commits] r7795 - in trunk/msautotest/wxs: . expected

[svn at osgeo.org]

Author: tomkralidis
Date: 2008-07-08 21:03:46 -0400 (Tue, 08 Jul 2008)
New Revision: 7795

Modified:
   trunk/msautotest/wxs/expected/wcs11_caps_updatesequence.xml
   trunk/msautotest/wxs/expected/wcs_cap.xml
   trunk/msautotest/wxs/expected/wcs_cap_11.xml
   trunk/msautotest/wxs/expected/wcs_caps_updatesequence.xml
   trunk/msautotest/wxs/wcs_simple.map
Log:
updated for WCS 1.1 support


Modified: trunk/msautotest/wxs/expected/wcs11_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs11_caps_updatesequence.xml	2008-07-08 22:02:38 UTC (rev 7794)
+++ trunk/msautotest/wxs/expected/wcs11_caps_updatesequence.xml	2008-07-09 01:03:46 UTC (rev 7795)
@@ -34,13 +34,10 @@
           <ows:ElectronicMailAddress>warmerdam at pobox.com</ows:ElectronicMailAddress>
         </ows:Address>
         <ows:OnlineResource xlink:type="simple" xlink:href="http://198.202.74.215/cgi-bin/wcs_demo"/>
-        <ows:HoursOfService/>
-<!--WARNING: Optional metadata "ows_hoursofservice" was missing for ows:HoursOfService-->
-        <ows:ContactInstructions/>
-<!--WARNING: Optional metadata "ows_contactinstructions" was missing for ows:ContactInstructions-->
+        <ows:HoursOfService>0800h - 1600h EST</ows:HoursOfService>
+        <ows:ContactInstructions>during hours of service</ows:ContactInstructions>
       </ows:ContactInfo>
-      <ows:Role/>
-<!--WARNING: Optional metadata "ows_role" was missing for ows:Role-->
+      <ows:Role>staff</ows:Role>
     </ows:ServiceContact>
   </ows:ServiceProvider>
   <ows:OperationsMetadata>

Modified: trunk/msautotest/wxs/expected/wcs_cap.xml
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_cap_11.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_cap_11.xml	2008-07-08 22:02:38 UTC (rev 7794)
+++ trunk/msautotest/wxs/expected/wcs_cap_11.xml	2008-07-09 01:03:46 UTC (rev 7795)
@@ -34,13 +34,10 @@
           <ows:ElectronicMailAddress>warmerdam at pobox.com</ows:ElectronicMailAddress>
         </ows:Address>
         <ows:OnlineResource xlink:type="simple" xlink:href="http://198.202.74.215/cgi-bin/wcs_demo"/>
-        <ows:HoursOfService/>
-<!--WARNING: Optional metadata "ows_hoursofservice" was missing for ows:HoursOfService-->
-        <ows:ContactInstructions/>
-<!--WARNING: Optional metadata "ows_contactinstructions" was missing for ows:ContactInstructions-->
+        <ows:HoursOfService>0800h - 1600h EST</ows:HoursOfService>
+        <ows:ContactInstructions>during hours of service</ows:ContactInstructions>
       </ows:ContactInfo>
-      <ows:Role/>
-<!--WARNING: Optional metadata "ows_role" was missing for ows:Role-->
+      <ows:Role>staff</ows:Role>
     </ows:ServiceContact>
   </ows:ServiceProvider>
   <ows:OperationsMetadata>

Modified: trunk/msautotest/wxs/expected/wcs_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_caps_updatesequence.xml	2008-07-08 22:02:38 UTC (rev 7794)
+++ trunk/msautotest/wxs/expected/wcs_caps_updatesequence.xml	2008-07-09 01:03:46 UTC (rev 7795)
@@ -14,7 +14,8 @@
   <name>MapServer WCS</name>
   <label>Test Label</label>
   <keywords>
-    <keyword>Test Keywords</keyword>
+    <keyword>keyword</keyword>
+    <keyword>list</keyword>
   </keywords>
 <responsibleParty>
     <individualName>Frank Warmerdam</individualName>

Modified: trunk/msautotest/wxs/wcs_simple.map
===================================================================
--- trunk/msautotest/wxs/wcs_simple.map	2008-07-08 22:02:38 UTC (rev 7794)
+++ trunk/msautotest/wxs/wcs_simple.map	2008-07-09 01:03:46 UTC (rev 7795)
@@ -142,11 +142,13 @@
    "ows_postcode" "K0J 1T0"
    "ows_country" "Canada"
    "ows_contactelectronicmailaddress" "warmerdam at pobox.com"
+   "ows_hoursofservice" "0800h - 1600h EST"
+   "ows_contactinstructions" "during hours of service"
+   "ows_role" "staff"
 
    # OGC:WCS
    "wcs_label"    "Test Label"
    "wcs_description" "Test description"
-   "wcs_keywordlist" "Test Keywords"
    "wcs_onlineresource"    "http://devgeo.cciw.ca/cgi-bin/mapserv/ecows"
    "wcs_metadatalink_href" "http://devgeo.cciw.ca/index.html"
   END