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

WWW/2002/ws/ra/edcopies/ws-enu enumeration.xsd,1.18,1.19

From: Doug Davis via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 29 Jun 2010 23:41:15 +0000
To: public-ws-resource-access-notifications@w3.org
Message-Id: <E1OTkQV-0000rP-RA@lionel-hutz.w3.org>
Update of /w3ccvs/WWW/2002/ws/ra/edcopies/ws-enu
In directory hutz:/tmp/cvs-serv3198

Modified Files:
	enumeration.xsd 
Log Message:
9609


Index: enumeration.xsd
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/ws-enu/enumeration.xsd,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- enumeration.xsd	13 May 2010 20:10:18 -0000	1.18
+++ enumeration.xsd	29 Jun 2010 23:41:13 -0000	1.19
@@ -7,7 +7,7 @@
     blockDefault='#all'>
 
   <xs:import namespace='http://www.w3.org/XML/1998/namespace'
-    schemaLocation='http://www.w3.org/2001/xml.xsd' />
+     schemaLocation='http://www.w3.org/2001/xml.xsd' />
   <xs:import
     namespace='http://www.w3.org/2005/08/addressing'
     schemaLocation='http://www.w3.org/2005/08/addressing/ws-addr.xsd' />
@@ -19,7 +19,7 @@
               minOccurs='0' maxOccurs='unbounded' />
     </xs:sequence>
     <xs:attribute name='Dialect' type='xs:anyURI' use='optional'
-                  default='http://www.w3.org/2009/09/ws-enu/Dialects/XPath10'/>
+                  default='http://www.w3.org/2002/ws/ra/edcopies/ws-enu/Dialects/XPath10'/>
     <xs:anyAttribute namespace='##other' processContents='lax' />
   </xs:complexType>
 
@@ -36,7 +36,7 @@
   </xs:simpleType>
 
   <xs:simpleType name='DurationDateTime'>
-    <xs:union memberTypes='xs:dateTime tns:NonNegativeDurationType' />
+      <xs:union memberTypes='xs:dateTime tns:NonNegativeDurationType' />
   </xs:simpleType>
 
   <xs:complexType name='MiniExpirationType'>
@@ -84,47 +84,32 @@
     </xs:simpleContent>
   </xs:complexType>
 
-  <!-- Enumerate request -->
-  <xs:element name='Enumerate'>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name='EndTo' type='wsa:EndpointReferenceType'
-                    minOccurs='0' />
-        <xs:element name='Expires' type='tns:ExpirationType' 
-                    minOccurs='0' />
-        <xs:element name='Filter' type='tns:FilterType' 
-                    minOccurs='0' />
-        <xs:any namespace='##other' processContents='lax' 
-                minOccurs='0' maxOccurs='unbounded' />
-      </xs:sequence>
-      <xs:anyAttribute namespace='##other' processContents='lax' />
-    </xs:complexType>
-  </xs:element>
-
   <!-- Used for a fault response -->
   <xs:element name='SupportedDialect' type='xs:anyURI' />
 
-  <!-- Enumerate response -->
-  <xs:element name='EnumerateResponse'>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name='GrantedExpires' type='tns:MiniExpirationType' 
-                    minOccurs='0' />
-        <xs:element name='EnumerationContext' 
-                    type='tns:EnumerationContextType' />
-        <xs:any namespace='##other' processContents='lax' 
-                minOccurs='0' maxOccurs='unbounded' />
-      </xs:sequence>
-      <xs:anyAttribute namespace='##other' processContents='lax' />
-    </xs:complexType>
-  </xs:element>
-
-  <!-- Pull request -->
-  <xs:element name='Pull'>
+  <!-- Enumerate request -->
+  <xs:element name='Enumerate'>
     <xs:complexType>
       <xs:sequence>
-        <xs:element name='EnumerationContext' 
-                    type='tns:EnumerationContextType' />
+        <xs:choice>
+          <xs:element name='NewContext'>
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name='EndTo' type='wsa:EndpointReferenceType'
+                            minOccurs='0' />
+                <xs:element name='Expires' type='tns:ExpirationType'
+                            minOccurs='0' />
+                <xs:element name='Filter' type='tns:FilterType'
+                            minOccurs='0' />
+                <xs:any namespace='##other' processContents='lax'
+                        minOccurs='0' maxOccurs='unbounded' />
+              </xs:sequence>
+              <xs:anyAttribute namespace='##other' processContents='lax' />
+            </xs:complexType>
+          </xs:element>
+          <xs:element name='EnumerationContext' 
+                      type='tns:EnumerationContextType' />
+        </xs:choice>
         <xs:element name='MaxTime' type='tns:PositiveDurationType' 
                     minOccurs='0' />
         <xs:element name='MaxElements' type='xs:positiveInteger' 
@@ -139,10 +124,12 @@
     </xs:complexType>
   </xs:element>
 
-  <!-- Pull response -->
-  <xs:element name='PullResponse'>
+  <!-- Enumerate response -->
+  <xs:element name='EnumerateResponse'>
     <xs:complexType>
       <xs:sequence>
+        <xs:element name='GrantedExpires' type='tns:MiniExpirationType'
+                    minOccurs='0' />
         <xs:element name='EnumerationContext' 
                     type='tns:EnumerationContextType' 
                     minOccurs='0' />
@@ -250,9 +237,9 @@
   <xs:simpleType name='EnumerationEndCodeType'>
     <xs:restriction base='xs:anyURI'>
       <xs:enumeration value=
-        'http://www.w3.org/2009/09/ws-enu/SourceShuttingDown' />
+        'http://www.w3.org/2002/ws/ra/edcopies/ws-enu/SourceShuttingDown' />
       <xs:enumeration value=
-        'http://www.w3.org/2009/09/ws-enu/SourceCancelling' />
+        'http://www.w3.org/2002/ws/ra/edcopies/ws-enu/SourceCancelling' />
     </xs:restriction>
   </xs:simpleType>
 
Received on Tuesday, 29 June 2010 23:41:17 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 29 June 2010 23:41:17 GMT