- From: Doug Davis via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 06 Oct 2009 16:20:33 +0000
- To: public-ws-resource-access-notifications@w3.org
Update of /w3ccvs/WWW/2002/ws/ra/edcopies/ws-evt
In directory hutz:/tmp/cvs-serv11147/ws-evt
Modified Files:
eventing.xsd
Log Message:
7478
Index: eventing.xsd
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/ws-evt/eventing.xsd,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- eventing.xsd 23 Sep 2009 10:12:34 -0000 1.16
+++ eventing.xsd 6 Oct 2009 16:20:31 -0000 1.17
@@ -39,11 +39,28 @@
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="ExpirationType">
- <xs:union memberTypes="xs:dateTime
- tns:NonNegativeDurationType" />
+ <xs:simpleType name="DurationDateTime">
+ <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="FilterType" mixed="true">
<xs:sequence>
<xs:any namespace="##other" processContents="lax"
@@ -91,7 +108,7 @@
<xs:sequence>
<xs:element name="SubscriptionManager"
type="wsa:EndpointReferenceType" />
- <xs:element name="Expires" type="tns:ExpirationType" />
+ <xs:element name="GrantedExpires" type="tns:MiniExpirationType" />
<xs:any namespace="##other" processContents="lax"
minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
@@ -122,7 +139,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:any namespace="##other" processContents="lax"
minOccurs="0" maxOccurs="unbounded" />
@@ -146,7 +163,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:20:35 UTC