[mapguide-commits] r5080 - trunk/MgDev/Server/src/Wfs

[svn_mapguide at osgeo.org]

Author: liuar
Date: 2010-08-11 02:56:23 +0000 (Wed, 11 Aug 2010)
New Revision: 5080

Modified:
   trunk/MgDev/Server/src/Wfs/1.1.0.xml.awd
   trunk/MgDev/Server/src/Wfs/OgcWfsService.config.awd
Log:
Ticket #1421 OGC WFS 1.1.0 Support

This submission enhanced the OgcWfsService.config.awd and 1.1.0 template file 1.1.0.xml.awd.
1. Add WFS 1.1.0 to the supported version list in WFS config file.
2. Add following definition items which are defined WFS 1.1.0 specification: ProviderName, ProviderSite, HoursOfService, Role
    <Define item="Service.Contact.ProviderName"></Define>
    <Define item="Service.Contact.ProviderSite"></Define>
    <Define item="Service.Contact.HoursOfService">24x7</Define>
    <Define item="Role"></Define>
3. Update the definition of Service.Keywords from multiple items to one item with multiple space seperated words.
4. Add a definition item ServiceTypeVersion.xml which enumerates the supported versions and be used in ServiceIdentification section
5. Add following items in ServiceIdentification section
    <ows:ProviderName>&Service.Contact.ProviderName;</ows:ProviderName>
    <ows:ProviderSite>&Service.Contact.ProviderSite;</ows:ProviderSite>
    <ows:HoursOfService>&Service.Contact.HoursOfService;</ows:HoursOfService>
    <ows:Role>&Service.Contact.Role;</ows:Role>

Modified: trunk/MgDev/Server/src/Wfs/1.1.0.xml.awd
===================================================================
--- trunk/MgDev/Server/src/Wfs/1.1.0.xml.awd	2010-08-09 11:13:27 UTC (rev 5079)
+++ trunk/MgDev/Server/src/Wfs/1.1.0.xml.awd	2010-08-11 02:56:23 UTC (rev 5080)
@@ -50,6 +50,7 @@
 
 
  <!-- Routine Enum formats, in xml -->
+ <Define item="ServiceTypeVersion.xml"><ows:ServiceTypeVersion>&Enum.item.number;</ows:ServiceTypeVersion></Define>
  <Define item="Keywords.xml"><ows:Keyword>&Enum.item;</ows:Keyword></Define>
  <Define item="ParameterValue.xml"><ows:Value>&Enum.item;</ows:Value></Define>
  <Define item="ParameterValue.Version.xml"><ows:Value>&Enum.item.number;</ows:Value></Define>
@@ -120,11 +121,11 @@
   <!-- ================================================================== -->
   <ows:ServiceIdentification>
     <ows:ServiceType>WFS</ows:ServiceType>
-    <ows:ServiceTypeVersion>1.1.0</ows:ServiceTypeVersion>
+    <?Enum list="&SupportedVersions;" using="&ServiceTypeVersion.xml;" item="Version"?>
     <ows:Title>&Service.Title;</ows:Title>
-    <ows:Abstract>&Service.Abstract</ows:Abstract>
+    <ows:Abstract>&Service.Abstract;</ows:Abstract>
     <ows:Keywords>
-      <?EnumDelim list="&Service.Keywords;"   using="&Keywords.xml;" ?>
+      <?Enum list="&Service.Keywords;" using="&Keywords.xml;"?>
     </ows:Keywords>
     <ows:Fees>&Service.Fees;</ows:Fees>
     <ows:AccessConstraints>&Service.AccessConstraints;</ows:AccessConstraints>
@@ -134,8 +135,8 @@
   <!-- SERVICE PROVIDER SECTION                                           -->
   <!-- ================================================================== -->
   <ows:ServiceProvider>
-    <ows:ProviderName></ows:ProviderName>
-    <ows:ProviderSite/>
+    <ows:ProviderName>&Service.Contact.ProviderName;</ows:ProviderName>
+    <ows:ProviderSite>&Service.Contact.ProviderSite;</ows:ProviderSite>
     <ows:ServiceContact>
       <ows:IndividualName>&Service.Contact.Name;</ows:IndividualName>
       <ows:PositionName>&Service.Contact.Position;</ows:PositionName>
@@ -153,10 +154,10 @@
           <ows:ElectronicMailAddress>&Service.Contact.Email;</ows:ElectronicMailAddress>
         </ows:Address>
         <ows:OnlineResource xlink:href="&URL.OnlineResource;"/>
-        <ows:HoursOfService>24x7</ows:HoursOfService>
+        <ows:HoursOfService>&Service.Contact.HoursOfService;</ows:HoursOfService>
         <ows:ContactInstructions>&Service.Contact.Instructions;</ows:ContactInstructions>
       </ows:ContactInfo>
-      <ows:Role>PointOfContact</ows:Role>
+      <ows:Role>&Service.Contact.Role;</ows:Role>
     </ows:ServiceContact>
   </ows:ServiceProvider>
 

Modified: trunk/MgDev/Server/src/Wfs/OgcWfsService.config.awd
===================================================================
--- trunk/MgDev/Server/src/Wfs/OgcWfsService.config.awd	2010-08-09 11:13:27 UTC (rev 5079)
+++ trunk/MgDev/Server/src/Wfs/OgcWfsService.config.awd	2010-08-11 02:56:23 UTC (rev 5080)
@@ -9,6 +9,7 @@
       Also, anything other than a <Version> element is ignored.    -->
  <Define item="SupportedVersions">
    <Version number="1.0.0"/>
+   <Version number="1.1.0"/>
  </Define>
 
  <!-- These are edited by the Site Administration tool, though you
@@ -19,6 +20,8 @@
  <Define item="Service.Abstract">MapGuide WFS Server</Define>
  <Define item="Service.AccessConstraints">none</Define>
  <!-- Who to contact -->
+ <Define item="Service.Contact.ProviderName"></Define>
+ <Define item="Service.Contact.ProviderSite"></Define>
  <Define item="Service.Contact.Name"></Define>
  <Define item="Service.Contact.Organization"></Define>
  <Define item="Service.Contact.Position"></Define>
@@ -31,8 +34,9 @@
  <Define item="Service.Contact.Phone"></Define>
  <Define item="Service.Contact.Fax"></Define>
  <Define item="Service.Contact.Email"></Define>
+ <Define item="Service.Contact.HoursOfService">24x7</Define>
  <Define item="Service.Contact.Instructions"></Define>
-
+ <Define item="Service.Contact.Role"></Define>
  <!-- The URL elements.  Change to suit, as this is reported -->
  <Define item="SERVER_NAME">localhost:8008</Define>
  <Define item="SCRIPT_NAME">/mapguide/mapagent/mapagent.fcgi</Define>
@@ -44,7 +48,7 @@
  <Define item="Url.GetFeature">http://&SERVER_NAME;&SCRIPT_NAME;</Define>
 
  <!-- List the keywords to be associated with the WFS - pick what describes your data -->
- <Define item="Service.Keywords"><item>GIS</item><item>WFS</item><item>Server</item></Define>
+ <Define item="Service.Keywords"><item>GIS WFS Server</item></Define>
 
 
  <!-- Enumerates an element in a dictionary for HTML