W3C home > Mailing lists > Public > public-ws-resource-access-notifications@w3.org > October 2009

WWW/2002/ws/ra/edcopies/ws-enu enumeration.xsd,1.8,1.9

From: Doug Davis via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 06 Oct 2009 16:40:22 +0000
To: public-ws-resource-access-notifications@w3.org
Message-Id: <E1MvD5K-0003vL-QF@lionel-hutz.w3.org>
Update of /w3ccvs/WWW/2002/ws/ra/edcopies/ws-enu
In directory hutz:/tmp/cvs-serv14876/ws-enu

Modified Files:
	enumeration.xsd 
Log Message:
7587


Index: enumeration.xsd
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/ws-enu/enumeration.xsd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- enumeration.xsd	23 Sep 2009 10:20:43 -0000	1.8
+++ enumeration.xsd	6 Oct 2009 16:40:20 -0000	1.9
@@ -35,9 +35,23 @@
     </xs:restriction>
   </xs:simpleType>
 
-  <xs:simpleType name="ExpirationType">
-    <xs:union memberTypes="xs:dateTime tns:NonNegativeDurationType" />
-  </xs:simpleType>
+  <xs:complexType name="MiniExpirationType">
+    <xs:simpleContent>
+      <xs:extension base="tns:DurationDateTime">
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="ExpirationType">
+    <xs:simpleContent>
+      <xs:extension base="tns:MiniExpirationType">
+        <xs:attribute name="min" type="tns:DurationDateTime" use="optional"/>
+        <xs:attribute name="max" type="tns:DurationDateTime" use="optional"/>
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
 
   <xs:complexType name="EnumerationContextType">
     <xs:complexContent mixed="true">
@@ -91,7 +105,7 @@
   <xs:element name="EnumerateResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="Expires" type="tns:ExpirationType" 
+        <xs:element name="GrantedExpires" type="tns:MiniExpirationType" 
                     minOccurs="0" />
         <xs:element name="EnumerationContext" 
                     type="tns:EnumerationContextType" />
@@ -155,7 +169,7 @@
   <xs:element name="RenewResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="Expires" type="tns:ExpirationType" 
+        <xs:element name="GrantedExpires" type="tns:MiniExpirationType" 
                     minOccurs="0" />
         <xs:element name="EnumerationContext" 
                     type="tns:EnumerationContextType" 
@@ -184,7 +198,7 @@
   <xs:element name="GetStatusResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="Expires" type="tns:ExpirationType"
+        <xs:element name="GrantedExpires" type="tns:MiniExpirationType"
                     minOccurs="0" />
         <xs:any namespace="##other" processContents="lax" 
                 minOccurs="0" maxOccurs="unbounded" />
Received on Tuesday, 6 October 2009 16:40:26 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 6 October 2009 16:40:27 GMT